diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-12-14 07:29:38 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-12-14 07:29:38 +0000 |
| commit | eaee2b68c511700b89997efa627146304c13887c (patch) | |
| tree | 3e26508ca0699f96507b77641a4c3aaefa0af993 /tethereal.c | |
| parent | 1f5bf52d6b1c3bbd922fe226ae188363fa74754a (diff) | |
| download | wireshark-eaee2b68c511700b89997efa627146304c13887c.tar.gz wireshark-eaee2b68c511700b89997efa627146304c13887c.tar.bz2 wireshark-eaee2b68c511700b89997efa627146304c13887c.zip | |
Constify a bunch of arguments and variables, to squelch compiler
warnings.
Include "wiretap/libpcap.h" in "capture_loop.h", to get its declarations
of data structures for headers in libpcap files. This lets us remove
the includes of "wiretap/libpcap.h from files including
"capture_loop.h".
Make "log_func_ignore()" in "tethereal.c" static, and declare some of
its arguments unused. Also get rid of an unused variable.
Include <pcap.h> before including "wiretap/wtap-capture.h", to declare
"struct pcap_pkthdr".
svn path=/trunk/; revision=16791
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tethereal.c b/tethereal.c index 37571e1ce3..1dc2ae01f6 100644 --- a/tethereal.c +++ b/tethereal.c @@ -94,7 +94,6 @@ #include <setjmp.h> #include "capture-pcap-util.h" #include <wiretap/wtap-capture.h> -#include <wiretap/libpcap.h> #ifdef _WIN32 #include "capture-wpcap.h" #include "capture_errs.h" @@ -581,7 +580,9 @@ add_decode_as(const gchar *cl_param) return TRUE; } -void log_func_ignore (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) +static void +log_func_ignore (const gchar *log_domain _U_, GLogLevelFlags log_level _U_, + const gchar *message _U_, gpointer user_data _U_) { } @@ -1379,7 +1380,6 @@ capture(char *save_file, int out_file_type) struct pcap_stat stats; gboolean write_ok; gboolean close_ok; - dfilter_t *rfcode = NULL; int save_file_fd; /* Initialize all data structures used for dissection. */ |