diff options
| author | Evan Huus <eapache@gmail.com> | 2013-03-30 12:15:42 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-03-30 12:15:42 +0000 |
| commit | 6fa584b0dbda49a36760d5274ed26de4c17b0db9 (patch) | |
| tree | a72786b19dde47ec87beeffa554cecaab99b273a /ui | |
| parent | 037bb3e614f7d9578aefb92a06a60711cf51bb2a (diff) | |
| download | wireshark-6fa584b0dbda49a36760d5274ed26de4c17b0db9.tar.gz | |
Move wireshark's display filter flag to -Y for consistency with tshark.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8223
svn path=/trunk/; revision=48653
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 53fcaeac7c..d35d2e36d2 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1190,7 +1190,7 @@ print_usage(gboolean print_ver) { fprintf(output, "\n"); fprintf(output, "User interface:\n"); fprintf(output, " -C <config profile> start with specified configuration profile\n"); - fprintf(output, " -d <display filter> start with the given display filter\n"); + fprintf(output, " -Y <display filter> start with the given display filter\n"); fprintf(output, " -g <packet number> go to specified packet number after \"-r\"\n"); fprintf(output, " -J <jump filter> jump to the first packet matching the (display)\n"); fprintf(output, " filter\n"); @@ -2211,7 +2211,7 @@ main(int argc, char *argv[]) #define OPTSTRING_I "" #endif -#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:C:d:Df:g:Hhi:" OPTSTRING_I "jJ:kK:lLm:nN:o:P:pr:R:Ss:t:u:vw:X:y:z:" +#define OPTSTRING "a:" OPTSTRING_A "b:" OPTSTRING_B "c:C:Df:g:Hhi:" OPTSTRING_I "jJ:kK:lLm:nN:o:P:pr:R:Ss:t:u:vw:X:y:Y:z:" static const char optstring[] = OPTSTRING; @@ -2635,9 +2635,6 @@ main(int argc, char *argv[]) case 'C': /* Configuration profile settings were already processed just ignore them this time*/ break; - case 'd': - dfilter = optarg; - break; case 'j': /* Search backwards for a matching packet from filter in option J */ jump_backwards = SD_BACKWARD; break; @@ -2768,6 +2765,9 @@ main(int argc, char *argv[]) case 'X': /* ext ops were already processed just ignore them this time*/ break; + case 'Y': + dfilter = optarg; + break; case 'z': /* We won't call the init function for the stat this soon as it would disallow MATE's fields (which are registered |