Move --fullscreen out of LONGOPT_CAPTURE_COMMON.

It's not a capture option, so it doesn't belong there.

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

2 files changed, 15 insertions, 2 deletions

diff --git a/capture_opts.h b/capture_opts.h
index 4cc52f91de..944a5c1d3c 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -50,6 +50,9 @@ extern "C" {
  * component of the entry for the long option, and have a case for that
  * option in the switch statement.
  *
+ * We also pick values <= 65535, so as to leave values > 65535 for
+ * options specific to a program.
+ *
  * NOTE:
  * for tshark, we're using a leading - in the optstring to prevent getopt()
  * from permuting the argv[] entries, in this case, unknown argv[] entries
@@ -67,7 +70,6 @@ extern "C" {
 #define LONGOPT_DISABLE_PROTOCOL  130
 #define LONGOPT_ENABLE_HEURISTIC  131
 #define LONGOPT_DISABLE_HEURISTIC 132
-#define LONGOPT_FULL_SCREEN       133
 
 /*
  * Options for capturing common to all capturing programs.
@@ -110,7 +112,6 @@ extern "C" {
     {"disable-protocol", required_argument, NULL, LONGOPT_DISABLE_PROTOCOL }, \
     {"enable-heuristic", required_argument, NULL, LONGOPT_ENABLE_HEURISTIC }, \
     {"disable-heuristic", required_argument, NULL, LONGOPT_DISABLE_HEURISTIC }, \
-    {"fullscreen",           no_argument,       NULL, LONGOPT_FULL_SCREEN },
 
 #define OPTSTRING_CAPTURE_COMMON \
     "a:" OPTSTRING_A "b:" OPTSTRING_B "c:Df:i:" OPTSTRING_I "Lps:y:"
diff --git a/ui/commandline.c b/ui/commandline.c
index f9c2547d19..d67a5ca16f 100644
--- a/ui/commandline.c
+++ b/ui/commandline.c
@@ -183,6 +183,17 @@ commandline_print_usage(gboolean for_help_option) {
 #endif
 }
 
+/*
+ * For long options with no corresponding short options, we define values
+ * outside the range of ASCII graphic characters, make that the last
+ * component of the entry for the long option, and have a case for that
+ * option in the switch statement.
+ *
+ * We also pick values > 65535, so as to leave values from 128 to 65535
+ * for capture options.
+ */
+#define LONGOPT_FULL_SCREEN       65536
+
 #define OPTSTRING OPTSTRING_CAPTURE_COMMON "C:d:g:Hh" "jJ:kK:lm:nN:o:P:r:R:St:u:vw:X:Y:z:"
 static const struct option long_options[] = {
         {"help", no_argument, NULL, 'h'},
@@ -190,6 +201,7 @@ static const struct option long_options[] = {
         {"read-filter", required_argument, NULL, 'R' },
         {"display-filter", required_argument, NULL, 'Y' },
         {"version", no_argument, NULL, 'v'},
+        {"fullscreen", no_argument, NULL, LONGOPT_FULL_SCREEN },
         LONGOPT_CAPTURE_COMMON
         {0, 0, 0, 0 }
     };