diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-11-28 20:06:21 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-11-28 20:06:21 +0000 |
| commit | 7f9585782d6f43f28ef3df26a889f1ca751399ce (patch) | |
| tree | a724e2aca856fa26b44107690d05fe4d544326dd /wiretap/file_wrappers.h | |
| parent | 48bb4deed163fab4449a06d1fed9667c492ed391 (diff) | |
| download | wireshark-7f9585782d6f43f28ef3df26a889f1ca751399ce.tar.gz | |
Fixes for Windows build w/o ZLIB
svn path=/trunk/; revision=23651
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 22d4a24b8c..b990a0014a 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -32,6 +32,7 @@ extern int file_error(void *fh); extern FILE_T file_open(const char *path, const char *mode); #define filed_open gzdopen +/* XX: gzread and gzwrite return number of *bytes* (not number of elements) */ #define file_read(buf, bsize, count, file) gzread((file),(buf),((count)*(bsize))) #define file_write(buf, bsize, count, file) gzwrite((file),(buf),((count)*(bsize))) #define file_close gzclose @@ -43,8 +44,9 @@ extern FILE_T file_open(const char *path, const char *mode); #define file_open(path, mode) eth_fopen(path, mode) #define filed_open fdopen -#define file_read fread -#define file_write fwrite +/* XX: file_read and file_write defined to return number of *bytes* to be consistent with gzread & gzwrite */ +#define file_read(buf, bsize, count, file) ((bsize) * fread((buf), (bsize), (count), (file))) +#define file_write(buf, bsize, count, file) ((bsize) * fwrite((buf), (bsize), (count), (file))) #define file_close fclose #define file_getc fgetc #define file_gets fgets |