diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-27 18:40:09 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-28 01:40:39 +0000 |
| commit | 5d019cfb13a75663f5fde39163650884208e5791 (patch) | |
| tree | 516164ad9c97613664871aad584ae789e2f032bf /ui/commandline.c | |
| parent | 3f49e897f674008c27de9833b8ba2d119dc22ef4 (diff) | |
| download | wireshark-5d019cfb13a75663f5fde39163650884208e5791.tar.gz | |
Make quit_after_cap an item in commandline_param_info_t.
And make the commandline_info structure global, so all the places that
look at quit_after_cap can get at it.
Change-Id: I006329cf8842c655cca36f024570855d1b16e107
Reviewed-on: https://code.wireshark.org/review/16182
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/commandline.c')
| -rw-r--r-- | ui/commandline.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index 56b621b69e..e7de6e1dcd 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -69,8 +69,6 @@ #if defined(HAVE_LIBPCAP) || defined(HAVE_EXTCAP) capture_options global_capture_opts; - -gboolean quit_after_cap; #endif void @@ -391,12 +389,11 @@ void commandline_other_options(int argc, char *argv[], commandline_param_info_t* param_info->start_capture = FALSE; param_info->list_link_layer_types = FALSE; #endif + param_info->quit_after_cap = getenv("WIRESHARK_QUIT_AFTER_CAPTURE") ? TRUE : FALSE; param_info->disable_protocol_slist = NULL; param_info->enable_heur_slist = NULL; param_info->disable_heur_slist = NULL; - quit_after_cap = getenv("WIRESHARK_QUIT_AFTER_CAPTURE") ? TRUE : FALSE; - while ((opt = getopt_long(argc, argv, optstring, long_options, NULL)) != -1) { switch (opt) { /*** capture option specific ***/ |