Rename stat_cmd_args.[ch] to stat_tap_ui.[ch].

The intent is to handle more than just command-line arguments; reflect that.

Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825
Reviewed-on: https://code.wireshark.org/review/5304
Reviewed-by: Guy Harris <guy@alum.mit.edu>

70 files changed, 89 insertions, 106 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 34a6ce61c0..7183de42bc 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1598,7 +1598,7 @@ set(LIBWIRESHARK_FILES
 	sigcomp-udvm.c
 	sminmpec.c
 	sna-utils.c
-	stat_cmd_args.c
+	stat_tap_ui.c
 	stats_tree.c
 	strutil.c
 	stream.c
diff --git a/epan/Makefile.common b/epan/Makefile.common
index 01fc5cf0c8..e0d4d333e9 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -84,7 +84,7 @@ LIBWIRESHARK_SRC =		\
 	sigcomp-udvm.c		\
 	sminmpec.c		\
 	sna-utils.c		\
-	stat_cmd_args.c		\
+	stat_tap_ui.c		\
 	stats_tree.c		\
 	strutil.c		\
 	stream.c		\
@@ -243,7 +243,7 @@ LIBWIRESHARK_INCLUDES =		\
 	slow_protocol_subtypes.h \
 	sminmpec.h		\
 	sna-utils.h		\
-	stat_cmd_args.h		\
+	stat_tap_ui.h		\
 	stat_groups.h		\
 	stats_tree.h		\
 	stats_tree_priv.h	\
diff --git a/epan/conversation_table.c b/epan/conversation_table.c
index 3f2f5eddd4..f14e91df84 100644
--- a/epan/conversation_table.c
+++ b/epan/conversation_table.c
@@ -31,7 +31,7 @@
 #include "addr_resolv.h"
 #include "emem.h"
 
-#include "stat_cmd_args.h"
+#include "stat_tap_ui.h"
 
 GList *cmd_string_list_ = NULL;
 
diff --git a/epan/stat_cmd_args.c b/epan/stat_tap_ui.c
index 38ccab529b..263fd330a9 100644
--- a/epan/stat_cmd_args.c
+++ b/epan/stat_tap_ui.c
@@ -1,5 +1,5 @@
-/* stat_cmd_args.c
- * Routines to register "-z" command-line argument handlers for stats
+/* stat_tap_ui.c
+ * Routines to register UI information for stats
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 /* structure to keep track of what stats have registered command-line
    arguments.
@@ -62,18 +62,6 @@ sort_by_name(gconstpointer a, gconstpointer b)
 }
 
 void
-register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* userdata)
-{
-    stat_cmd_arg *newsca;
-
-    newsca=(stat_cmd_arg *)g_malloc(sizeof(stat_cmd_arg));
-    newsca->cmd=cmd;
-    newsca->func=func;
-    newsca->userdata=userdata;
-    stat_cmd_arg_list=g_slist_insert_sorted(stat_cmd_arg_list, newsca, sort_by_name);
-}
-
-void
 register_stat_tap_ui(stat_tap_ui *ui, void *userdata)
 {
     stat_cmd_arg *newsca;
diff --git a/epan/stat_cmd_args.h b/epan/stat_tap_ui.h
index e0a35af4fc..defa0c0ae9 100644
--- a/epan/stat_cmd_args.h
+++ b/epan/stat_tap_ui.h
@@ -1,6 +1,5 @@
-/* stat_cmd_args.h
- * Declarations of routines to register "-z" command-line argument handlers
- * for stats
+/* stat_tap_ui.h
+ * Declarations of routines to register UI information for stats
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -21,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __STAT_CMD_ARGS_H__
-#define __STAT_CMD_ARGS_H__
+#ifndef __STAT_TAP_UI_H__
+#define __STAT_TAP_UI_H__
 
 #include "ws_symbol_export.h"
 
@@ -30,21 +29,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/** Register a stat ("-z") command line argument.
- *
- * @param cmd The command name without arguments, e.g. "conv,tcp" or "io,stat".
- * MUST be valid when other stat_cmd routines below are called.
- * @param func Callbak to be invoked when the CLI argument is supplied.
- * @param userdata Additional data for the callback.
- */
-#if 0
-WS_DLL_PUBLIC void register_stat_cmd_arg(const char *cmd,
-    void (*func)(const char *arg,void* userdata), void* userdata);
-#endif
-WS_DLL_PUBLIC gboolean process_stat_cmd_arg(char *optstr);
-WS_DLL_PUBLIC void list_stat_cmd_args(void);
-WS_DLL_PUBLIC void start_requested_stats(void);
-
 /*
  * Parameters for taps.
  */
@@ -65,6 +49,9 @@ typedef struct _tap_param {
 	const enum_val_t *enum_vals;
 } tap_param;
 
+/*
+ * UI information for a tap.
+ */
 typedef struct _stat_tap_ui {
 	register_stat_group_t group;	/* group to which statistic belongs */
 	const char *title;		/* title of statistic */
@@ -75,11 +62,19 @@ typedef struct _stat_tap_ui {
 	tap_param *params;		/* pointer to table of parameter info */
 } stat_tap_ui;
 
-/*
- * Register the parameters a tap takes.
+/** Register UI information for a tap.
+ *
+ * @param ui UI information for the tap.
+ * @param userdata Additional data for the init routine.
  */
 WS_DLL_PUBLIC void register_stat_tap_ui(stat_tap_ui *ui, void *userdata);
 
+WS_DLL_PUBLIC gboolean process_stat_cmd_arg(char *optstr);
+
+WS_DLL_PUBLIC void list_stat_cmd_args(void);
+
+WS_DLL_PUBLIC void start_requested_stats(void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c
index 6a98c68ee2..ec0a4e3784 100644
--- a/epan/wslua/wslua_util.c
+++ b/epan/wslua/wslua_util.c
@@ -28,7 +28,7 @@
 
 #include "wslua.h"
 #include <math.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 
 WSLUA_FUNCTION wslua_get_version(lua_State* L) { /* Gets a string of the Wireshark version. */
diff --git a/rawshark.c b/rawshark.c
index 9f54e472e5..8d29f34574 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -96,7 +96,7 @@
 #include "conditions.h"
 #include "capture_stop_conditions.h"
 #include <epan/epan_dissect.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/timestamp.h>
 #include <wsutil/unicode-utils.h>
 #include "epan/column-utils.h"
diff --git a/tfshark.c b/tfshark.c
index 2c595dc8af..38b94199c9 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -91,7 +91,7 @@
 #include "register.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/timestamp.h>
 #include <epan/ex-opt.h>
 #include <wiretap/wtap-int.h>
diff --git a/tshark.c b/tshark.c
index ec3bf552b8..c413218863 100644
--- a/tshark.c
+++ b/tshark.c
@@ -102,7 +102,7 @@
 #include "register.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/timestamp.h>
 #include <epan/conversation_table.h>
 #include <epan/ex-opt.h>
diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c
index 374fd3d921..9e5b962364 100644
--- a/ui/cli/tap-afpstat.c
+++ b/ui/cli/tap-afpstat.c
@@ -29,7 +29,7 @@
 
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-afp.h>
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c
index 9c8d7df5f2..6c8a418777 100644
--- a/ui/cli/tap-ansi_astat.c
+++ b/ui/cli/tap-ansi_astat.c
@@ -35,7 +35,7 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
 
diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
index d0810889af..a8856a1e81 100644
--- a/ui/cli/tap-bootpstat.c
+++ b/ui/cli/tap-bootpstat.c
@@ -28,7 +28,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 void register_tap_listener_gtkdhcpstat(void);
 
diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c
index 3b36f8e19c..961d61db89 100644
--- a/ui/cli/tap-camelcounter.c
+++ b/ui/cli/tap-camelcounter.c
@@ -33,7 +33,7 @@
 #include "epan/packet_info.h"
 #include "epan/tap.h"
 #include "epan/value_string.h"
-#include "epan/stat_cmd_args.h"
+#include "epan/stat_tap_ui.h"
 #include "epan/asn1.h"
 #include "epan/dissectors/packet-camel.h"
 
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index d01ee43e98..bdc235f5e9 100644
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -35,7 +35,7 @@
 #include "epan/dissectors/packet-camel.h"
 #include "epan/dissectors/packet-tcap.h"
 #include "epan/timestats.h"
-#include "epan/stat_cmd_args.h"
+#include "epan/stat_tap_ui.h"
 
 
 void register_tap_listener_camelsrt(void);
diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 5b8a38a754..a97332d679 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -42,7 +42,7 @@
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/timestamp.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-ip.h>
 #include "epan/timestats.h"
 
diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
index ff305ffce4..caaa3973e9 100644
--- a/ui/cli/tap-dcerpcstat.c
+++ b/ui/cli/tap-dcerpcstat.c
@@ -28,7 +28,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
 #define MICROSECS_PER_SEC   1000000
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 805cdd0812..257c210b36 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -43,7 +43,7 @@
 #include "epan/packet_info.h"
 #include <epan/tap.h>
 #include <epan/epan_dissect.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include "epan/ftypes/ftypes.h"
 #include "epan/to_str.h"
diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c
index 8cd0a568c6..b6e5cc80e2 100644
--- a/ui/cli/tap-expert.c
+++ b/ui/cli/tap-expert.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/expert.h>
 
 void register_tap_listener_expert_info(void);
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index fb820b07e3..9c448e3255 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -39,7 +39,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
 #include <epan/follow.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/tvbuff-int.h>
 
diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index f9a23d197d..8f4a233294 100644
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -32,7 +32,7 @@
 
 #include <epan/funnel.h>
 #include <stdio.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 void register_tap_listener_gtkfunnel(void);
 
diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c
index dfa5edda83..9d07d7c47d 100644
--- a/ui/cli/tap-gsm_astat.c
+++ b/ui/cli/tap-gsm_astat.c
@@ -35,7 +35,7 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a_common.h>
 
diff --git a/ui/cli/tap-h225counter.c b/ui/cli/tap-h225counter.c
index 710a47f31d..29555a9e9c 100644
--- a/ui/cli/tap-h225counter.c
+++ b/ui/cli/tap-h225counter.c
@@ -30,7 +30,7 @@
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-h225.h>
 
diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
index 63f307a83d..2c61e8ee3d 100644
--- a/ui/cli/tap-h225rassrt.c
+++ b/ui/cli/tap-h225rassrt.c
@@ -30,7 +30,7 @@
 #include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-h225.h>
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c
index 1efe39f911..eb5babf8c2 100644
--- a/ui/cli/tap-hosts.c
+++ b/ui/cli/tap-hosts.c
@@ -33,7 +33,7 @@
 #include <cfile.h>
 #include <epan/proto.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>
 
 void register_tap_listener_hosts(void);
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index ce165d6b8f..0d187fa301 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -29,7 +29,7 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-http.h>
 
 void register_tap_listener_gtkhttpstat(void);
diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c
index 87d6602cca..793685e13f 100644
--- a/ui/cli/tap-icmpstat.c
+++ b/ui/cli/tap-icmpstat.c
@@ -34,7 +34,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 #include <math.h>
 
diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c
index a7a62f34fb..bca9d46b76 100644
--- a/ui/cli/tap-icmpv6stat.c
+++ b/ui/cli/tap-icmpv6stat.c
@@ -35,7 +35,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-icmp.h>
 #include <math.h>
 
diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c
index b771f81e2b..0e31b34000 100644
--- a/ui/cli/tap-iostat.c
+++ b/ui/cli/tap-iostat.c
@@ -30,7 +30,7 @@
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/timestamp.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/strutil.h>
 #include "globals.h"
 
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 7119c192c4..9f07ebdb9d 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <epan/tap.h>
 #include <epan/timestamp.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <ui/traffic_table_ui.h>
 #include <epan/conversation_table.h>
 #include <ui/cli/tshark-tap.h>
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index 9bf9c07b3d..0eb397ee4c 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-mac-lte.h>
 
 void register_tap_listener_mac_lte_stat(void);
diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c
index d6a97eb3e1..7b14260a9f 100644
--- a/ui/cli/tap-megacostat.c
+++ b/ui/cli/tap-megacostat.c
@@ -30,7 +30,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include "epan/gcp.h"
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c
index 85753c89a1..503d430b74 100644
--- a/ui/cli/tap-mgcpstat.c
+++ b/ui/cli/tap-mgcpstat.c
@@ -28,7 +28,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include "epan/dissectors/packet-mgcp.h"
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c
index cabcd1c21a..6bfab62522 100644
--- a/ui/cli/tap-protocolinfo.c
+++ b/ui/cli/tap-protocolinfo.c
@@ -32,7 +32,7 @@
 #include "epan/column-utils.h"
 #include "epan/proto.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/strutil.h>
 
 void register_tap_listener_protocolinfo(void);
diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c
index 1d8b6dc771..71b67472c0 100644
--- a/ui/cli/tap-protohierstat.c
+++ b/ui/cli/tap-protohierstat.c
@@ -32,7 +32,7 @@
 #include "epan/epan_dissect.h"
 #include "epan/proto.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 void register_tap_listener_protohierstat(void);
 
diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
index 96aa1ba6f3..b892b16089 100644
--- a/ui/cli/tap-radiusstat.c
+++ b/ui/cli/tap-radiusstat.c
@@ -28,7 +28,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-radius.h>
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index 0eadabeb86..cd37793d5c 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -30,7 +30,7 @@
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rlc-lte.h>
 
 void register_tap_listener_rlc_lte_stat(void);
diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c
index c7bbd2e7d3..611abf5894 100644
--- a/ui/cli/tap-rpcprogs.c
+++ b/ui/cli/tap-rpcprogs.c
@@ -32,7 +32,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rpc.h>
 
 #define MICROSECS_PER_SEC   1000000
diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c
index 83d090953d..d0bc0b14be 100644
--- a/ui/cli/tap-rpcstat.c
+++ b/ui/cli/tap-rpcstat.c
@@ -34,7 +34,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-rpc.h>
 
 #define MICROSECS_PER_SEC   1000000
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index 90dd2b19d1..ee7596e0af 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -42,7 +42,7 @@
 #include "epan/value_string.h"
 #include <epan/tap.h>
 #include <epan/rtp_pt.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/addr_resolv.h>
 #include "ui/rtp_stream.h"
 #include "ui/tap-rtp-common.h"
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 9b9343bf06..988d7b4759 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -32,7 +32,7 @@
 #include "epan/packet_info.h"
 #include "epan/value_string.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "register.h"
 #include <epan/dissectors/packet-rtsp.h>
 
diff --git a/ui/cli/tap-scsistat.c b/ui/cli/tap-scsistat.c
index 569ad123be..35bf4c9654 100644
--- a/ui/cli/tap-scsistat.c
+++ b/ui/cli/tap-scsistat.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-scsi.h>
diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c
index 9641591688..2adaa42c54 100644
--- a/ui/cli/tap-sctpchunkstat.c
+++ b/ui/cli/tap-sctpchunkstat.c
@@ -30,7 +30,7 @@
 #include "epan/packet_info.h"
 #include "epan/addr_resolv.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/to_str.h>
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index 8002156798..e8e0271f61 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -30,7 +30,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-sip.h>
 
diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c
index ee7148bfee..754e0bcd4f 100644
--- a/ui/cli/tap-smbsids.c
+++ b/ui/cli/tap-smbsids.c
@@ -29,7 +29,7 @@
 #include "epan/packet_info.h"
 #include <epan/dissectors/packet-smb-sidsnooping.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-smb.h>
 
diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c
index b216d2b3df..00d75fb79f 100644
--- a/ui/cli/tap-smbstat.c
+++ b/ui/cli/tap-smbstat.c
@@ -28,7 +28,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-smb.h>
 #include "epan/timestats.h"
diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index 88273d0b5d..efb4bcb092 100644
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@@ -30,7 +30,7 @@
 #include <wsutil/report_err.h>
 
 #include <epan/stats_tree_priv.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 void register_tap_listener_stats_tree_stat(void);
 
diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index eb659e79b8..9700556508 100644
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <epan/packet_info.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/dissectors/packet-sv.h>
 
 void register_tap_listener_sv(void);
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index e8ab5669db..167a9cb567 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -33,7 +33,7 @@
 
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-wsp.h>
 
diff --git a/ui/gtk/ansi_a_stat.c b/ui/gtk/ansi_a_stat.c
index 52a782e65d..d885ec732e 100644
--- a/ui/gtk/ansi_a_stat.c
+++ b/ui/gtk/ansi_a_stat.c
@@ -38,7 +38,7 @@
 #include "epan/packet_info.h"
 #include "epan/epan.h"
 #include "epan/value_string.h"
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c
index 2afb16b5f6..a2362dcee9 100644
--- a/ui/gtk/ansi_map_stat.c
+++ b/ui/gtk/ansi_map_stat.c
@@ -38,7 +38,7 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/value_string.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ansi_map.h>
 
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 888b4f37cf..cffbba7add 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -45,7 +45,7 @@
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/epan_dissect.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/to_str.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c
index d658a26869..6241334186 100644
--- a/ui/gtk/dcerpc_stat.c
+++ b/ui/gtk/dcerpc_stat.c
@@ -37,7 +37,7 @@
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-dcerpc.h>
 
diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c
index 409a4ff987..2202e8818f 100644
--- a/ui/gtk/expert_comp_dlg.c
+++ b/ui/gtk/expert_comp_dlg.c
@@ -29,7 +29,7 @@
 #include <epan/packet_info.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 #include <epan/stat_groups.h>
 
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index 5cb780847d..66a6ac5601 100644
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -31,7 +31,7 @@
 #include <epan/epan.h>
 #include <epan/packet.h>
 #include <wsutil/filesystem.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/to_str.h>
 #include <epan/strutil.h>
 
diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c
index 2abcaee693..cdf093550b 100644
--- a/ui/gtk/gsm_a_stat.c
+++ b/ui/gtk/gsm_a_stat.c
@@ -38,7 +38,7 @@
 #include "epan/packet_info.h"
 #include "epan/epan.h"
 #include "epan/value_string.h"
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a_common.h>
diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c
index c18423ca5d..2f38e63e2c 100644
--- a/ui/gtk/gsm_map_stat.c
+++ b/ui/gtk/gsm_map_stat.c
@@ -39,7 +39,7 @@
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/value_string.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/asn1.h>
 #include <epan/dissectors/packet-gsm_map.h>
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 1920e0b9db..4684d599e3 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -61,7 +61,7 @@
 #include <epan/dissectors/packet-iax2.h>
 #include <epan/iax2_codec_type.h>
 #include <epan/addr_resolv.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/strutil.h>
 
 #include <epan/stat_groups.h>
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index 97c654fc0d..242f3b4f60 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -30,7 +30,7 @@
 
 #include <epan/epan_dissect.h>
 #include <epan/packet_info.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/strutil.h>
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 058418d1fc..a78edc01b8 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -81,7 +81,7 @@
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/uat.h>
 #include <epan/print.h>
 #include <epan/timestamp.h>
diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c
index 9a7c4d73ff..2817326a84 100644
--- a/ui/gtk/mtp3_stat.c
+++ b/ui/gtk/mtp3_stat.c
@@ -38,7 +38,7 @@
 #include "epan/packet_info.h"
 #include "epan/epan.h"
 #include "epan/value_string.h"
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/dissectors/packet-mtp3.h>
diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c
index fa54e00304..264c0bf3f0 100644
--- a/ui/gtk/rpc_progs.c
+++ b/ui/gtk/rpc_progs.c
@@ -35,7 +35,7 @@
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c
index 144799fac2..553a6c5433 100644
--- a/ui/gtk/rpc_stat.c
+++ b/ui/gtk/rpc_stat.c
@@ -35,7 +35,7 @@
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rpc.h>
 
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 4e18fa57c2..fa15dcf2cf 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -60,7 +60,7 @@
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/rtp_pt.h>
 #include <epan/addr_resolv.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/strutil.h>
 
 #include <epan/stat_groups.h>
diff --git a/ui/gtk/scsi_stat.c b/ui/gtk/scsi_stat.c
index 6efc70b2b1..c3afac9195 100644
--- a/ui/gtk/scsi_stat.c
+++ b/ui/gtk/scsi_stat.c
@@ -32,7 +32,7 @@
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/tap.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-scsi.h>
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c
index 1ff225cf2c..c81924c7d6 100644
--- a/ui/gtk/tap_param_dlg.c
+++ b/ui/gtk/tap_param_dlg.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 #include "../file.h"
 #include "../globals.h"
diff --git a/ui/gtk/tap_param_dlg.h b/ui/gtk/tap_param_dlg.h
index cbbf335d49..0282b52e63 100644
--- a/ui/gtk/tap_param_dlg.h
+++ b/ui/gtk/tap_param_dlg.h
@@ -62,7 +62,7 @@
  */
 
 #include <epan/params.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 typedef struct _tap_param_dlg {
 	const char *win_title;		/* title */
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index 576936f266..24188beeea 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -42,7 +42,7 @@
 #include <epan/packet.h>
 #include "wsutil/filesystem.h"
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/to_str.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index c60ca8d3a7..ffecc3602a 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -22,7 +22,7 @@
 #include "io_graph_dialog.h"
 #include "ui_io_graph_dialog.h"
 
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include "epan/stats_tree_priv.h"
 #include "epan/uat-int.h"
 
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index d1256f642c..24fc283510 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -72,7 +72,7 @@
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 #include <epan/tap.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 #include <epan/uat.h>
 #include <epan/column.h>
 #include <epan/disabled_protos.h>
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 561c46f228..3f65b6c482 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -24,7 +24,7 @@
 
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/stat_cmd_args.h>
+#include <epan/stat_tap_ui.h>
 
 //#include <epan/dissectors/packet-tcp.h>