diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-02-06 09:58:30 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-02-06 09:58:30 +0000 |
| commit | 23d1a63f39d096018057b333b1b7a99c52d18e17 (patch) | |
| tree | 1507cee556dbf1f1c1e7a4113e29b81e530e49d8 /wiretap/file_wrappers.h | |
| parent | 8bc19844ca6b4442e37cbea69b13a72a88008a07 (diff) | |
| download | wireshark-23d1a63f39d096018057b333b1b7a99c52d18e17.tar.gz | |
zlib 1.0.8 - the version that comes with X11 - does have "gzseek()",
even if it doesn't have "gzgets()", so one might think we could use it
by using our own replacement for "gzgets()".
One would be wrong to think so, however, as the "gzseek()" it has
doesn't actually work when reading uncompressed files.
zlib 1.0.9 has "gzgets()", and fixes that bug, so we rever to checking
for "gzgets()" rather than "gzseek()", so that we don't accept pre-1.0.9
versions of zlib, and we get rid of our "gzgets()" replacement.
svn path=/trunk/; revision=4702
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 56641569b1..97566e0ce4 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -1,6 +1,6 @@ /* file_wrappers.h * - * $Id: file_wrappers.h,v 1.6 2001/11/13 23:55:43 gram Exp $ + * $Id: file_wrappers.h,v 1.7 2002/02/06 09:58:30 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -32,10 +32,8 @@ extern long file_seek(void *stream, long offset, int whence); #define file_write(buf, bsize, count, file) gzwrite((file),(buf),((count)*(bsize))) #define file_close gzclose extern long file_tell(void *stream); -char * internal_gzgets(gzFile file, char *buf, int len); -int internal_gzgetc(gzFile file); -#define file_getc internal_gzgetc -#define file_gets(buf, len, file) internal_gzgets((file), (buf), (len)) +#define file_getc gzgetc +#define file_gets(buf, len, file) gzgets((file), (buf), (len)) extern int file_error(void *fh); #else /* No zLib */ |