diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-19 13:21:17 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-19 20:21:30 +0000 |
| commit | 85c805d60e752a6cd376c97a269596fdd7f15002 (patch) | |
| tree | b19e72834b96f4dea940ad6b0aaab064bed944a7 /ui/gtk | |
| parent | 0ca9fc11b0594e6d89cf222a407f3144f3d997cf (diff) | |
| download | wireshark-85c805d60e752a6cd376c97a269596fdd7f15002.tar.gz | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 2f573db55f..30d15800e2 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2377,12 +2377,6 @@ main(int argc, char *argv[]) commandline_info.enable_heur_slist = NULL; commandline_info.disable_heur_slist = NULL; - /* Transfer capture option data to other options structure */ - commandline_info.arg_error = capture_param_info.arg_error; -#ifndef HAVE_LIBPCAP - commandline_info.capture_option_specified = capture_param_info.capture_option_specified; -#endif - /* Now get our args */ commandline_other_options(argc, argv, &commandline_info, TRUE); |