diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-05 00:34:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-05 00:34:42 +0000 |
| commit | 537d308abee89c938a51040c7315a0dda62c091f (patch) | |
| tree | 2af1d1f3e7ff5dab230520d5f70c0c4d69e2d38a /wiretap | |
| parent | af5c56797852c055de9bb261c87298e3c8f4cde7 (diff) | |
"open_cap_file()" in Ethereal and Tethereal don't use the FILE_T they
get from calling "wtap_file()", so get rid of the call and the
(otherwise unused) variable to which its result gets assigned.
That lets us get rid of "wtap_file()" in Wiretap.
It also lets us get rid of the include of "zlib.h" in "file.h"; the
#defines of "file_open()", "filed_open()", and "file_close()" are also
unnecessary, so we get rid of those as well.
However, that means we need to include <zlib.h> in "gtk/main.c" and
"tethereal.c", so that the version number of libz is defined and can
show up in the version string.
svn path=/trunk/; revision=3652
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/wtap.c | 8 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 200d6420a3..63475d73b0 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.52 2001/03/15 09:11:03 guy Exp $ + * $Id: wtap.c,v 1.53 2001/07/05 00:34:42 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -30,12 +30,6 @@ #include "file_wrappers.h" #include "buffer.h" -FILE* -wtap_file(wtap *wth) -{ - return wth->fh; -} - int wtap_fd(wtap *wth) { diff --git a/wiretap/wtap.h b/wiretap/wtap.h index fe4f302e77..c2201dedc3 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.86 2001/03/15 09:11:03 guy Exp $ + * $Id: wtap.h,v 1.87 2001/07/05 00:34:42 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -302,7 +302,6 @@ struct wtap_pkthdr *wtap_phdr(wtap *wth); union wtap_pseudo_header *wtap_pseudoheader(wtap *wth); guint8 *wtap_buf_ptr(wtap *wth); -FILE* wtap_file(wtap *wth); int wtap_fd(wtap *wth); int wtap_snapshot_length(wtap *wth); /* per file */ int wtap_file_type(wtap *wth); |