From da70ea1c30ff548851d9e10ba306b2fda8f43186 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 18 Feb 2019 19:58:29 -0800
Subject: [PATCH] Use #defines for long-option codes.

Change-Id: Ife800efd4d2621b295a1c07ae182758a3b6f276c
Reviewed-on: https://code.wireshark.org/review/32095
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 editcap.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/editcap.c b/editcap.c
index 187b1e2211..4a0bdb1f4a 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1009,11 +1009,15 @@ main(int argc, char *argv[])
     int           i, j, read_err, write_err;
     gchar        *read_err_info, *write_err_info;
     int           opt;
+#define LONGOPT_NO_VLAN              0x8100
+#define LONGOPT_SKIP_RADIOTAP_HEADER 0x8101
+#define LONGOPT_SEED                 0x8102
+#define LONGOPT_INJECT_SECRETS       0x8103
     static const struct option long_options[] = {
-        {"novlan", no_argument, NULL, 0x8100},
-        {"skip-radiotap-header", no_argument, NULL, 0x8101},
-        {"seed", required_argument, NULL, 0x8102},
-        {"inject-secrets", required_argument, NULL, 0x8103},
+        {"novlan", no_argument, NULL, LONGOPT_NO_VLAN},
+        {"skip-radiotap-header", no_argument, NULL, LONGOPT_SKIP_RADIOTAP_HEADER},
+        {"seed", required_argument, NULL, LONGOPT_SEED},
+        {"inject-secrets", required_argument, NULL, LONGOPT_INJECT_SECRETS},
         {"help", no_argument, NULL, 'h'},
         {"version", no_argument, NULL, 'V'},
         {0, 0, 0, 0 }
@@ -1087,19 +1091,19 @@ main(int argc, char *argv[])
     /* Process the options */
     while ((opt = getopt_long(argc, argv, ":a:A:B:c:C:dD:E:F:hi:I:Lo:rs:S:t:T:vVw:", long_options, NULL)) != -1) {
         switch (opt) {
-        case 0x8100:
+        case LONGOPT_NO_VLAN:
         {
             rem_vlan = TRUE;
             break;
         }
 
-        case 0x8101:
+        case LONGOPT_SKIP_RADIOTAP_HEADER:
         {
             skip_radiotap = TRUE;
             break;
         }
 
-        case 0x8102:
+        case LONGOPT_SEED:
         {
             if (sscanf(optarg, "%u", &seed) != 1) {
                 fprintf(stderr, "editcap: \"%s\" isn't a valid seed\n\n",
@@ -1111,7 +1115,7 @@ main(int argc, char *argv[])
             break;
         }
 
-        case 0x8103: /* --inject-secrets */
+        case LONGOPT_INJECT_SECRETS:
         {
             guint32 secrets_type_id = 0;
             const char *secrets_filename = NULL;