"-d" isn't common to all capturing programs, it's dumpcap-specific.

Change-Id: I827615d45051c9d66407516b311d3de448de6d07
Reviewed-on: https://code.wireshark.org/review/2495
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/capture_opts.h b/capture_opts.h
index afc402e2bcd6150592e808ed3890d19b523d8d4c..d6898780235b085618e33a099849ad85d96bdc62 100644 (file)
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -112,12 +112,6 @@ extern "C" {
 #define OPTSTRING_I ""
 #endif
 
-#ifdef HAVE_BPF_IMAGE
-#define OPTSTRING_d "d"
-#else
-#define OPTSTRING_d ""
-#endif
-
 #define OPTSTRING_CAPTURE_COMMON \
         "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:"
 

diff --git a/dumpcap.c b/dumpcap.c
index 4b6ced0ad394cc35a31deaff95f046c18fb27803..93a7f9e50dbcc18c5bfe4ffca7e3b80b024e88f8 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4240,6 +4240,12 @@ main(int argc, char *argv[])
     ws_init_dll_search_path();
 #endif
 
+#ifdef HAVE_BPF_IMAGE
+#define OPTSTRING_d "d"
+#else
+#define OPTSTRING_d ""
+#endif
+
 #ifdef HAVE_PCAP_REMOTE
 #define OPTSTRING_r "r"
 #define OPTSTRING_u "u"