From cc4710ac5fde8f7e524637e41185eacd1aafabcd Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 20 Jun 2014 14:38:39 -0700 Subject: Also define LONGOPT_CAPTURE_COMMON as nothing if we don't have pcap. While we're at it, simplify the #ifdefs and #defines in capture_opts.h - don't do the same tests twice. Change-Id: I2079167f31789470ef77120054d769d5914745e3 Reviewed-on: https://code.wireshark.org/review/2496 Reviewed-by: Guy Harris --- capture_opts.h | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) (limited to 'capture_opts.h') diff --git a/capture_opts.h b/capture_opts.h index d689878023..8c15c00476 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -66,19 +66,29 @@ extern "C" { #define MIN_NON_CAPTURE_LONGOPT 129 /* - * Long options for capturing common to all capturing programs. + * Options for capturing common to all capturing programs. */ +#ifdef HAVE_PCAP_REMOTE +#define OPTSTRING_A "A:" +#else +#define OPTSTRING_A "" +#endif + #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) #define LONGOPT_BUFFER_SIZE \ {(char *)"buffer-size", required_argument, NULL, 'B'}, +#define OPTSTRING_B "B:" #else #define LONGOPT_BUFFER_SIZE +#define OPTSTRING_B "" #endif #ifdef HAVE_PCAP_CREATE #define LONGOPT_MONITOR_MODE {(char *)"monitor-mode", no_argument, NULL, 'I'}, +#define OPTSTRING_I "I" #else #define LONGOPT_MONITOR_MODE +#define OPTSTRING_I "" #endif #define LONGOPT_CAPTURE_COMMON \ @@ -90,28 +100,6 @@ extern "C" { {(char *)"snapshot-length", required_argument, NULL, 's'}, \ {(char *)"linktype", required_argument, NULL, 'y'} -/* - * Short options for capturing common to all capturing programs. - */ - -#ifdef HAVE_PCAP_REMOTE -#define OPTSTRING_A "A:" -#else -#define OPTSTRING_A "" -#endif - -#if defined(_WIN32) || defined(HAVE_PCAP_CREATE) -#define OPTSTRING_B "B:" -#else -#define OPTSTRING_B "" -#endif /* _WIN32 or HAVE_PCAP_CREATE */ - -#ifdef HAVE_PCAP_CREATE -#define OPTSTRING_I "I" -#else -#define OPTSTRING_I "" -#endif - #define OPTSTRING_CAPTURE_COMMON \ "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:" -- cgit v1.2.3