From 85c805d60e752a6cd376c97a269596fdd7f15002 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 19 Jun 2016 13:21:17 -0700 Subject: Handle capture options in pcap-less Wireshark in the commandline_ routines. Get rid of the capture_option_specified and arg_error members of the commandline_capture_param_info_t and commandline_param_info_t structures, and have them be local variables in commandline_early_options() and commandline_other_options(). Have commandline_early_options() print the "sorry, Wireshark wasn't built with pcap" and exit if -D was specified but Wireshark wasn't built with pcap. Change-Id: I0efcdea89d9585af8f3c0a28aee060f33d3ec5fd Reviewed-on: https://code.wireshark.org/review/16021 Reviewed-by: Guy Harris --- ui/commandline.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'ui/commandline.h') diff --git a/ui/commandline.h b/ui/commandline.h index 8cb88fdda4..0953f126d2 100644 --- a/ui/commandline.h +++ b/ui/commandline.h @@ -33,10 +33,6 @@ typedef struct commandline_capture_param_info { GString *comp_info_str; GString *runtime_info_str; - gboolean arg_error; -#ifndef HAVE_LIBPCAP - gboolean capture_option_specified; -#endif } commandline_capture_param_info_t; extern void commandline_early_options(int argc, char *argv[], commandline_capture_param_info_t* param_info); @@ -44,12 +40,9 @@ extern void commandline_early_options(int argc, char *argv[], commandline_captur /* Command-line options that don't have direct API calls to handle the data */ typedef struct commandline_param_info { - gboolean arg_error; #ifdef HAVE_LIBPCAP gboolean list_link_layer_types; gboolean start_capture; -#else - gboolean capture_option_specified; #endif e_prefs *prefs_p; search_direction jump_backwards; -- cgit v1.2.1