From b2622e1194b9551569bb1ea4bed9e9241516608d Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 20 Jun 2014 16:43:13 -0700
Subject: [PATCH] Move the "capture-comment" long option to
 LONGOPT_CAPTURE_COMMON.

Change-Id: I55884d48911de307cde52accfebbda69f2989526
Reviewed-on: https://code.wireshark.org/review/2505
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 capture_opts.h | 1 +
 dumpcap.c      | 1 -
 tshark.c       | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/capture_opts.h b/capture_opts.h
index 5d6aa66674..9439c4e958 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -92,6 +92,7 @@ extern "C" {
 #endif
 
 #define LONGOPT_CAPTURE_COMMON \
+        {(char *)"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT}, \
         {(char *)"autostop", required_argument, NULL, 'a'}, \
         {(char *)"ring-buffer", required_argument, NULL, 'b'}, \
         LONGOPT_BUFFER_SIZE \
diff --git a/dumpcap.c b/dumpcap.c
index f018e68926..73e4e5d7eb 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4177,7 +4177,6 @@ main(int argc, char *argv[])
     GString          *runtime_info_str;
     int               opt;
     static const struct option long_options[] = {
-        {(char *)"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT },
         {(char *)"help", no_argument, NULL, 'h'},
         {(char *)"version", no_argument, NULL, 'v'},
         LONGOPT_CAPTURE_COMMON
diff --git a/tshark.c b/tshark.c
index 2007384cdc..e6272cf771 100644
--- a/tshark.c
+++ b/tshark.c
@@ -923,7 +923,6 @@ main(int argc, char *argv[])
   char                *init_progfile_dir_error;
   int                  opt;
   static const struct option long_options[] = {
-    {(char *)"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT },
     {(char *)"help", no_argument, NULL, 'h'},
     {(char *)"version", no_argument, NULL, 'v'},
     LONGOPT_CAPTURE_COMMON