diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-19 12:55:48 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-19 19:56:04 +0000 |
| commit | 42985f4f175a49410dfe6c74f52fde6e733cec1b (patch) | |
| tree | 1347140a2ad5f717c991d9004a134fe6442a9090 | |
| parent | 147b3d5149ec6cfce1489f9922cc5e4ac0ca2209 (diff) | |
Those aren't capture options, they're the options we must process early.
The only one of those options that has anything to do with packet
capture is -i, and all we do there is check for an argument of "-"; the
rest are either
1) options that affect your preference settings (-C to select
the profile, -P to set the personal file directory path);
2) options that just print something to the standard output or
error and exit, before firing up the GUI;
3) extension command line options (-X).
Change-Id: Iba9b8b14fe468e2ca9d4c67e1a9b8103603678d9
Reviewed-on: https://code.wireshark.org/review/16019
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ui/commandline.c | 2 | ||||
| -rw-r--r-- | ui/commandline.h | 2 | ||||
| -rw-r--r-- | ui/gtk/main.c | 2 | ||||
| -rw-r--r-- | wireshark-qt.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index 04b2d1cab9..a9bd32eb44 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -192,7 +192,7 @@ static const struct option long_options[] = { }; static const char optstring[] = OPTSTRING; -void commandline_capture_options(int argc, char *argv[], commandline_capture_param_info_t* param_info) +void commandline_early_options(int argc, char *argv[], commandline_capture_param_info_t* param_info) { int opt; #ifdef HAVE_LIBPCAP diff --git a/ui/commandline.h b/ui/commandline.h index 2f0beeec20..8cb88fdda4 100644 --- a/ui/commandline.h +++ b/ui/commandline.h @@ -39,7 +39,7 @@ typedef struct commandline_capture_param_info #endif } commandline_capture_param_info_t; -extern void commandline_capture_options(int argc, char *argv[], commandline_capture_param_info_t* param_info); +extern void commandline_early_options(int argc, char *argv[], commandline_capture_param_info_t* param_info); /* Command-line options that don't have direct API calls to handle the data */ typedef struct commandline_param_info diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 8e6702c94e..2f573db55f 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2203,7 +2203,7 @@ main(int argc, char *argv[]) rf_path, g_strerror(rf_open_errno)); } - commandline_capture_options(argc, argv, &capture_param_info); + commandline_early_options(argc, argv, &capture_param_info); /* Init the "Open file" dialog directory */ /* (do this after the path settings are processed) */ diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index f332dc455a..ed77e5ae75 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -453,7 +453,7 @@ int main(int argc, char *argv[]) g_free(rf_path); } - commandline_capture_options(argc, ws_argv, &capture_param_info); + commandline_early_options(argc, ws_argv, &capture_param_info); #ifdef _WIN32 reset_library_path(); |