From 9a50b0f20b496e448d3e6e924ea964b6dd2c7fca Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 20 Jun 2014 14:14:02 -0700 Subject: [PATCH] Define OPTSTRING_CAPTURE_COMMON as nothing if we don't have pcap. No capturing, no capture options. Change-Id: I0023184b9c358d5876f19a098590f34d641c8649 Reviewed-on: https://code.wireshark.org/review/2493 Reviewed-by: Guy Harris --- tshark.c | 2 +- ui/qt/main.cpp | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/tshark.c b/tshark.c index 78104cada9..79bd386f17 100644 --- a/tshark.c +++ b/tshark.c @@ -975,7 +975,7 @@ main(int argc, char *argv[]) gchar *output_only = NULL; #ifndef HAVE_LIBPCAP -#define OPTSTRING_B "" +#define OPTSTRING_CAPTURE_COMMON "" #endif /* HAVE_LIBPCAP */ /* the leading - ensures that getopt() does not permute the argv[] entries diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index b0d9fafb7d..4a0a6e85aa 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -499,22 +499,10 @@ int main(int argc, char *argv[]) // XXX Should the remaining code be in WiresharkApplcation::WiresharkApplication? -#ifdef HAVE_LIBPCAP -#if defined(_WIN32) || defined(HAVE_PCAP_CREATE) -#define OPTSTRING_B "B:" -#else -#define OPTSTRING_B "" -#endif /* _WIN32 or HAVE_PCAP_CREATE */ -#else /* HAVE_LIBPCAP */ -#define OPTSTRING_B "" +#ifndef HAVE_LIBPCAP +#define OPTSTRING_CAPTURE_COMMON "" #endif /* HAVE_LIBPCAP */ -#ifdef HAVE_PCAP_CREATE -#define OPTSTRING_I "I" -#else -#define OPTSTRING_I "" -#endif - #define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:g:Hh" "jJ:kK:lm:nN:o:P:Qr:R:St:u:vw:X:z:" static const struct option long_options[] = { {(char *)"help", no_argument, NULL, 'h'},