summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-07-25 13:50:00 +0200
committerGuy Harris <guy@alum.mit.edu>2014-07-25 21:26:01 +0000
commit0492921adc1d6e3978b93bcac35140510228a62a (patch)
treeb1a2314608c978c1788bdedfa329e4bea9fac6c1 /tshark.c
parentc3e42cc6b4e21b0278e8bae5064ac1b99031f045 (diff)
downloadwireshark-0492921adc1d6e3978b93bcac35140510228a62a.tar.gz
Replace lseek/fstat by ws_lseek64/ws_fstat64
lseek returns an off_t type which is system-dependent. Use ws_lseek64 in favor of lseek as that supports 64-bit quanities. Use ws_fstat64 instead of stat to support 64-bit file sizes on Windows. For the majority of the changes, this makes no difference as they do not apply to Windows ("ifndef _WIN32"; availability of st_blksize). There are no other users of "struct stat" besides the portability code in wsutil. Forbid the use of fstat and lseek in checkAPIs. Change-Id: I17b930ab9543f21a9d3100f3795d250c9b9ae459 Reviewed-on: https://code.wireshark.org/review/3198 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tshark.c b/tshark.c
index 3d5c6a4d68..dcd30b930d 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3417,9 +3417,9 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
*/
#ifndef _WIN32
if (print_packet_info) {
- struct stat stat_stdout, stat_stderr;
+ ws_statb64 stat_stdout, stat_stderr;
- if (fstat(1, &stat_stdout) == 0 && fstat(2, &stat_stderr) == 0) {
+ if (ws_fstat64(1, &stat_stdout) == 0 && ws_fstat64(2, &stat_stderr) == 0) {
if (stat_stdout.st_dev == stat_stderr.st_dev &&
stat_stdout.st_ino == stat_stderr.st_ino) {
fflush(stdout);