summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-11-14 12:05:31 -0800
committerGuy Harris <guy@alum.mit.edu>2014-11-14 20:06:02 +0000
commit04ab731933cf231f19956665cba64742923b28e5 (patch)
tree7999134242b72c9e71c6d40605a322e8075f49e5 /ui
parent4729e13df79d8a1f17542c0f21049c13003c8374 (diff)
downloadwireshark-04ab731933cf231f19956665cba64742923b28e5.tar.gz
The registered -z parameter string shouldn't end with a comma.
If it ends with a comma, then, if you don't provide any parameters, you get a "no such -z statistic" message followed by a list of available statistics. If it doesn't end with a comma, then, if you don't provide any parameters *and* a parameter is required, you get a usage message, which is more useful - and, in many of those cases, a parameter *isn't* required. Change-Id: I81275ea41ad4611d8210ca3cb07c09f0abde58f2 Reviewed-on: https://code.wireshark.org/review/5308 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r--ui/cli/tap-ansi_astat.c2
-rw-r--r--ui/cli/tap-bootpstat.c2
-rw-r--r--ui/cli/tap-comparestat.c2
-rw-r--r--ui/cli/tap-dcerpcstat.c2
-rw-r--r--ui/cli/tap-gsm_astat.c2
-rw-r--r--ui/cli/tap-httpstat.c2
-rw-r--r--ui/cli/tap-iostat.c2
-rw-r--r--ui/cli/tap-protocolinfo.c2
-rw-r--r--ui/cli/tap-rpcstat.c2
-rw-r--r--ui/cli/tap-rtspstat.c2
-rw-r--r--ui/cli/tap-scsistat.c2
-rw-r--r--ui/cli/tap-wspstat.c2
-rw-r--r--ui/gtk/dcerpc_stat.c2
-rw-r--r--ui/gtk/rpc_stat.c2
14 files changed, 14 insertions, 14 deletions
diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
index 6c8a418777..c5a68a5bf9 100644
--- a/ui/cli/tap-ansi_astat.c
+++ b/ui/cli/tap-ansi_astat.c
@@ -156,7 +156,7 @@ ansi_a_stat_init(const char *opt_arg _U_, void *userdata _U_)
static stat_tap_ui ansi_a_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "ansi_a,",
+ "ansi_a",
ansi_a_stat_init,
-1,
0,
diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
index b5942f8dfc..88e2a49bde 100644
--- a/ui/cli/tap-bootpstat.c
+++ b/ui/cli/tap-bootpstat.c
@@ -177,7 +177,7 @@ dhcpstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui dhcpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "bootp,stat,",
+ "bootp,stat",
dhcpstat_init,
-1,
0,
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index a97332d679..95495eaa16 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -565,7 +565,7 @@ comparestat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui comparestat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "compare,",
+ "compare",
comparestat_init,
-1,
0,
diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
index caaa3973e9..2144f7e572 100644
--- a/ui/cli/tap-dcerpcstat.c
+++ b/ui/cli/tap-dcerpcstat.c
@@ -291,7 +291,7 @@ dcerpcstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui dcerpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "dcerpc,srt,",
+ "dcerpc,srt",
dcerpcstat_init,
-1,
0,
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index 9d07d7c47d..8db139e2d5 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -342,7 +342,7 @@ gsm_a_stat_init(const char *opt_arg _U_, void *userdata _U_)
static stat_tap_ui gsm_a_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "gsm_a,",
+ "gsm_a",
gsm_a_stat_init,
-1,
0,
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index 9f59be9eef..573c707572 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -323,7 +323,7 @@ httpstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui httpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "http,stat,",
+ "http,stat",
httpstat_init,
-1,
0,
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index 0e31b34000..9677d4570a 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -1499,7 +1499,7 @@ iostat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui iostat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "io,stat,",
+ "io,stat",
iostat_init,
-1,
0,
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index 6bfab62522..3b574c22ef 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -133,7 +133,7 @@ protocolinfo_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui protocolinfo_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "proto,colinfo,",
+ "proto,colinfo",
protocolinfo_init,
-1,
0,
diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c
index d0bc0b14be..b17fed7cd9 100644
--- a/ui/cli/tap-rpcstat.c
+++ b/ui/cli/tap-rpcstat.c
@@ -345,7 +345,7 @@ rpcstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui rpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "rpc,srt,",
+ "rpc,srt",
rpcstat_init,
-1,
0,
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index f548460049..24e516be25 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -276,7 +276,7 @@ rtspstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui rtspstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "rtsp,stat,",
+ "rtsp,stat",
rtspstat_init,
-1,
0,
diff --git a/ui/cli/tap-scsistat.c b/ui/cli/tap-scsistat.c
index 35bf4c9654..ac64219463 100644
--- a/ui/cli/tap-scsistat.c
+++ b/ui/cli/tap-scsistat.c
@@ -254,7 +254,7 @@ scsistat_init(const char *opt_arg, void* userdata _U_)
static stat_tap_ui scsistat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "scsi,srt,",
+ "scsi,srt",
scsistat_init,
-1,
0,
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 167a9cb567..8c882bbfe9 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -279,7 +279,7 @@ wspstat_init(const char *opt_arg, void *userdata _U_)
static stat_tap_ui wspstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "wsp,stat,",
+ "wsp,stat",
wspstat_init,
-1,
0,
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index 6241334186..e1fff8a179 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -717,7 +717,7 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_)
static stat_tap_ui dcerpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "dcerpc,srt,",
+ "dcerpc,srt",
gtk_dcerpcstat_init,
-1,
0,
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index 553a6c5433..feb15809ee 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -526,7 +526,7 @@ gtk_rpcstat_cb(GtkAction *action _U_, gpointer user_data _U_)
static stat_tap_ui rpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
- "rpc,srt,",
+ "rpc,srt",
gtk_rpcstat_init,
-1,
0,