diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-04-06 07:09:56 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-04-06 07:09:56 +0000 |
| commit | f73c579d5531540775dd4ac10af305fb5206790b (patch) | |
| tree | c84064fb40b44f049e500ce25b036c389793a0c7 /wiretap/file_wrappers.h | |
| parent | 7fa6d929cf2dc248fa35259ce8094b7b906b2022 (diff) | |
| download | wireshark-f73c579d5531540775dd4ac10af305fb5206790b.tar.gz | |
From Jakub Zawadzki:
file-wrappers.[ch] is used only for reading files, and mode is always
"rb".
Attached patch removes 'mode' argument from file_open() & filed_open().
svn path=/trunk/; revision=36493
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 93dec01434..544d995b6b 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -30,8 +30,8 @@ extern int file_error(void *fh); #ifdef HAVE_LIBZ -extern FILE_T file_open(const char *path, const char *mode); -#define filed_open gzdopen +extern FILE_T file_open(const char *path); +#define filed_open(fildes) gzdopen(fildes, "rb") #define file_read(buf, count, file) gzread((file),(buf),(unsigned)(count)) #define file_close gzclose #define file_getc gzgetc @@ -40,8 +40,8 @@ extern FILE_T file_open(const char *path, const char *mode); #else /* No zLib */ -#define file_open(path, mode) ws_fopen(path, mode) -#define filed_open fdopen +#define file_open(path) ws_fopen(path, "rb") +#define filed_open(fildes) fdopen(fildes, "rb") #define file_read(buf, count, file) fread((buf), (1), (count), (file)) #define file_close fclose #define file_getc fgetc |