diff options
author | Guy Harris <guy@alum.mit.edu> | 2011-04-10 16:53:32 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2011-04-10 16:53:32 +0000 |
commit | f27f61ac9eed53604cfef4cedf21a5b06f248f33 (patch) | |
tree | dff9a94892f320ecb4b7e2f02551ba4b52120ded /wiretap/wtap-int.h | |
parent | 8b8082442d72cffa8ab5dcf6edae539558ea1bc2 (diff) |
Move the definition of the structure pointed to by a FILE_T into
wiretap/file_wrappers.c; nothing outside of file_wrappers.c needs to
know what it looks like, it just passes around pointers to it.
svn path=/trunk/; revision=36538
Diffstat (limited to 'wiretap/wtap-int.h')
-rw-r--r-- | wiretap/wtap-int.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 6c020fd7ec..a9f0758663 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -39,32 +39,7 @@ #include <zlib.h> #endif /* HAVE_LIBZ */ -typedef struct { - int fd; /* file descriptor */ - gint64 pos; /* current position in uncompressed data */ - unsigned size; /* buffer size */ - unsigned char *in; /* input buffer */ - unsigned char *out; /* output buffer (double-sized when reading) */ - unsigned char *next; /* next output data to deliver or write */ - - unsigned have; /* amount of output data unused at next */ - int eof; /* true if end of input file reached */ - gint64 start; /* where the gzip data started, for rewinding */ - gint64 raw; /* where the raw data started, for seeking */ - int compression; /* 0: ?, 1: uncompressed, 2: zlib */ - /* seek request */ - gint64 skip; /* amount to skip (already rewound if backwards) */ - int seek; /* true if seek request pending */ - /* error information */ - int err; /* error code */ - - unsigned int avail_in; /* number of bytes available at next_in */ - unsigned char *next_in; /* next input byte */ -#ifdef HAVE_LIBZ - /* zlib inflate stream */ - z_stream strm; /* stream structure in-place (not a pointer) */ -#endif -} wtap_reader, *FILE_T; +typedef struct wtap_reader *FILE_T; #include "wtap.h" |