forked from osmocom/wireshark
Rename LONGOPT_NUM_CAP_COMMENT to LONGOPT_CAPTURE_COMMENT.
The latter is what editcap calls --capture-comment, and the _NUM serves no purpose whatsoever. One #define name for it suffices.
This commit is contained in:
parent
95dc4f52bc
commit
dfef4a750d
|
@ -803,7 +803,7 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg_
|
|||
int status, snaplen;
|
||||
|
||||
switch(opt) {
|
||||
case LONGOPT_NUM_CAP_COMMENT: /* capture comment */
|
||||
case LONGOPT_CAPTURE_COMMENT: /* capture comment */
|
||||
if (!capture_opts->capture_comment) {
|
||||
capture_opts->capture_comment = g_ptr_array_new_with_free_func(g_free);
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ extern "C" {
|
|||
* In short: we must not use 1 here, which is another reason to use
|
||||
* values outside the range of ASCII graphic characters.
|
||||
*/
|
||||
#define LONGOPT_NUM_CAP_COMMENT LONGOPT_BASE_CAPTURE+1
|
||||
#define LONGOPT_CAPTURE_COMMENT LONGOPT_BASE_CAPTURE+1
|
||||
#define LONGOPT_LIST_TSTAMP_TYPES LONGOPT_BASE_CAPTURE+2
|
||||
#define LONGOPT_SET_TSTAMP_TYPE LONGOPT_BASE_CAPTURE+3
|
||||
#define LONGOPT_COMPRESS_TYPE LONGOPT_BASE_CAPTURE+4
|
||||
|
@ -76,7 +76,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#define LONGOPT_CAPTURE_COMMON \
|
||||
{"capture-comment", required_argument, NULL, LONGOPT_NUM_CAP_COMMENT}, \
|
||||
{"capture-comment", required_argument, NULL, LONGOPT_CAPTURE_COMMENT}, \
|
||||
{"autostop", required_argument, NULL, 'a'}, \
|
||||
{"ring-buffer", required_argument, NULL, 'b'}, \
|
||||
LONGOPT_BUFFER_SIZE \
|
||||
|
|
|
@ -5139,7 +5139,7 @@ main(int argc, char *argv[])
|
|||
case 's': /* Set the snapshot (capture) length */
|
||||
case 'w': /* Write to capture file x */
|
||||
case 'y': /* Set the pcap data link type */
|
||||
case LONGOPT_NUM_CAP_COMMENT: /* add a capture comment */
|
||||
case LONGOPT_CAPTURE_COMMENT: /* add a capture comment */
|
||||
#ifdef HAVE_PCAP_REMOTE
|
||||
case 'u': /* Use UDP for data transfer */
|
||||
case 'r': /* Capture own RPCAP traffic too */
|
||||
|
|
2
tshark.c
2
tshark.c
|
@ -1100,7 +1100,7 @@ main(int argc, char *argv[])
|
|||
#endif
|
||||
case 's': /* Set the snapshot (capture) length */
|
||||
case 'y': /* Set the pcap data link type */
|
||||
case LONGOPT_NUM_CAP_COMMENT: /* add a capture comment */
|
||||
case LONGOPT_CAPTURE_COMMENT: /* add a capture comment */
|
||||
#ifdef CAN_SET_CAPTURE_BUFFER_SIZE
|
||||
case 'B': /* Buffer size */
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue