summaryrefslogtreecommitdiff
path: root/wireshark-qt.cpp
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-06-19 13:21:17 -0700
committerGuy Harris <guy@alum.mit.edu>2016-06-19 20:21:30 +0000
commit85c805d60e752a6cd376c97a269596fdd7f15002 (patch)
treeb19e72834b96f4dea940ad6b0aaab064bed944a7 /wireshark-qt.cpp
parent0ca9fc11b0594e6d89cf222a407f3144f3d997cf (diff)
downloadwireshark-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 'wireshark-qt.cpp')
-rw-r--r--wireshark-qt.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index ed77e5ae75..809c9eba7d 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -612,12 +612,6 @@ int 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);