From a21436eaeddb4979950e569f8004d84680af8075 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 14 Nov 2014 10:42:26 -0800 Subject: [PATCH] tap_ui -> stat_tap_ui. The old routine had stat_ in the name, as the expectation was that they were for statistics taps; that's still the expectation, so have stat_ in the data structure and routine names. Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a Reviewed-on: https://code.wireshark.org/review/5303 Reviewed-by: Guy Harris --- epan/conversation_table.c | 6 +++--- epan/stat_cmd_args.c | 4 ++-- epan/stat_cmd_args.h | 6 +++--- epan/wslua/wslua_util.c | 4 ++-- ui/cli/tap-afpstat.c | 4 ++-- ui/cli/tap-ansi_astat.c | 4 ++-- ui/cli/tap-bootpstat.c | 4 ++-- ui/cli/tap-camelcounter.c | 4 ++-- ui/cli/tap-camelsrt.c | 4 ++-- ui/cli/tap-comparestat.c | 4 ++-- ui/cli/tap-dcerpcstat.c | 4 ++-- ui/cli/tap-diameter-avp.c | 4 ++-- ui/cli/tap-expert.c | 4 ++-- ui/cli/tap-follow.c | 12 ++++++------ ui/cli/tap-funnel.c | 4 ++-- ui/cli/tap-gsm_astat.c | 4 ++-- ui/cli/tap-h225counter.c | 4 ++-- ui/cli/tap-h225rassrt.c | 4 ++-- ui/cli/tap-hosts.c | 4 ++-- ui/cli/tap-httpstat.c | 4 ++-- ui/cli/tap-icmpstat.c | 4 ++-- ui/cli/tap-icmpv6stat.c | 4 ++-- ui/cli/tap-iostat.c | 4 ++-- ui/cli/tap-macltestat.c | 4 ++-- ui/cli/tap-megacostat.c | 4 ++-- ui/cli/tap-mgcpstat.c | 4 ++-- ui/cli/tap-protocolinfo.c | 4 ++-- ui/cli/tap-protohierstat.c | 4 ++-- ui/cli/tap-radiusstat.c | 4 ++-- ui/cli/tap-rlcltestat.c | 4 ++-- ui/cli/tap-rpcprogs.c | 4 ++-- ui/cli/tap-rpcstat.c | 4 ++-- ui/cli/tap-rtp.c | 4 ++-- ui/cli/tap-rtspstat.c | 4 ++-- ui/cli/tap-scsistat.c | 4 ++-- ui/cli/tap-sctpchunkstat.c | 4 ++-- ui/cli/tap-sipstat.c | 4 ++-- ui/cli/tap-smbsids.c | 4 ++-- ui/cli/tap-smbstat.c | 4 ++-- ui/cli/tap-stats_tree.c | 4 ++-- ui/cli/tap-sv.c | 4 ++-- ui/cli/tap-wspstat.c | 4 ++-- ui/gtk/ansi_map_stat.c | 4 ++-- ui/gtk/compare_stat.c | 4 ++-- ui/gtk/dcerpc_stat.c | 4 ++-- ui/gtk/expert_comp_dlg.c | 4 ++-- ui/gtk/flow_graph.c | 4 ++-- ui/gtk/gsm_a_stat.c | 40 +++++++++++++++++++------------------- ui/gtk/gsm_map_stat.c | 4 ++-- ui/gtk/iax2_analysis.c | 4 ++-- ui/gtk/io_stat.c | 4 ++-- ui/gtk/mtp3_stat.c | 4 ++-- ui/gtk/rpc_progs.c | 4 ++-- ui/gtk/rpc_stat.c | 4 ++-- ui/gtk/rtp_analysis.c | 4 ++-- ui/gtk/tap_param_dlg.c | 4 ++-- ui/gtk/voip_calls_dlg.c | 4 ++-- ui/qt/io_graph_dialog.cpp | 4 ++-- 58 files changed, 140 insertions(+), 140 deletions(-) diff --git a/epan/conversation_table.c b/epan/conversation_table.c index 2639edd065..3f2f5eddd4 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -148,7 +148,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_ register_ct_t *table; GString *conv_cmd_str = g_string_new("conv,"); GString *host_cmd_str = g_string_new(""); - tap_ui ui_info; + stat_tap_ui ui_info; table = g_new(register_ct_t,1); @@ -171,7 +171,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_ ui_info.index = -1; ui_info.nparams = 0; ui_info.params = NULL; - register_tap_ui(&ui_info, table); + register_stat_tap_ui(&ui_info, table); g_string_free(conv_cmd_str, FALSE); g_string_printf(host_cmd_str, "%s,%s", (get_hostlist_prefix_func(table) != NULL) ? get_hostlist_prefix_func(table)() : "host", @@ -183,7 +183,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_ ui_info.index = -1; ui_info.nparams = 0; ui_info.params = NULL; - register_tap_ui(&ui_info, table); + register_stat_tap_ui(&ui_info, table); g_string_free(host_cmd_str, FALSE); } diff --git a/epan/stat_cmd_args.c b/epan/stat_cmd_args.c index 064711a933..38ccab529b 100644 --- a/epan/stat_cmd_args.c +++ b/epan/stat_cmd_args.c @@ -34,7 +34,7 @@ arguments. */ typedef struct _stat_cmd_arg { - tap_ui *ui; + stat_tap_ui *ui; const char *cmd; void (*func)(const char *arg, void* userdata); void* userdata; @@ -74,7 +74,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* us } void -register_tap_ui(tap_ui *ui, void *userdata) +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_cmd_args.h index 588d7eee1d..e0a35af4fc 100644 --- a/epan/stat_cmd_args.h +++ b/epan/stat_cmd_args.h @@ -65,7 +65,7 @@ typedef struct _tap_param { const enum_val_t *enum_vals; } tap_param; -typedef struct _tap_ui { +typedef struct _stat_tap_ui { register_stat_group_t group; /* group to which statistic belongs */ const char *title; /* title of statistic */ const char *cli_string; /* initial part of the "-z" argument for statistic */ @@ -73,12 +73,12 @@ typedef struct _tap_ui { gint index; /* initiate this value always with "-1" */ size_t nparams; /* number of parameters */ tap_param *params; /* pointer to table of parameter info */ -} tap_ui; +} stat_tap_ui; /* * Register the parameters a tap takes. */ -WS_DLL_PUBLIC void register_tap_ui(tap_ui *ui, void *userdata); +WS_DLL_PUBLIC void register_stat_tap_ui(stat_tap_ui *ui, void *userdata); #ifdef __cplusplus } diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c index 4db45287a2..6a98c68ee2 100644 --- a/epan/wslua/wslua_util.c +++ b/epan/wslua/wslua_util.c @@ -264,7 +264,7 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) { #define WSLUA_OPTARG_register_stat_cmd_arg_ACTION 2 /* Action */ const char* arg = luaL_checkstring(L,WSLUA_ARG_register_stat_cmd_arg_ARGUMENT); statcmd_t* sc = (statcmd_t *)g_malloc0(sizeof(statcmd_t)); /* XXX leaked */ - tap_ui ui_info; + stat_tap_ui ui_info; sc->L = L; lua_pushvalue(L, WSLUA_OPTARG_register_stat_cmd_arg_ACTION); @@ -278,7 +278,7 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) { ui_info.index = -1; ui_info.nparams = 0; ui_info.params = NULL; - register_tap_ui(&ui_info, sc); + register_stat_tap_ui(&ui_info, sc); return 0; } diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c index e9d1b4d0fa..374fd3d921 100644 --- a/ui/cli/tap-afpstat.c +++ b/ui/cli/tap-afpstat.c @@ -152,7 +152,7 @@ afpstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui afpstat_ui = { +static stat_tap_ui afpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "afp,srt", @@ -165,7 +165,7 @@ static tap_ui afpstat_ui = { void register_tap_listener_afpstat(void) { - register_tap_ui(&afpstat_ui, NULL); + register_stat_tap_ui(&afpstat_ui, NULL); } /* diff --git a/ui/cli/tap-ansi_astat.c b/ui/cli/tap-ansi_astat.c index 0f00d3fa63..9c8d7df5f2 100644 --- a/ui/cli/tap-ansi_astat.c +++ b/ui/cli/tap-ansi_astat.c @@ -153,7 +153,7 @@ ansi_a_stat_init(const char *opt_arg _U_, void *userdata _U_) } -static tap_ui ansi_a_stat_ui = { +static stat_tap_ui ansi_a_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "ansi_a,", @@ -166,7 +166,7 @@ static tap_ui ansi_a_stat_ui = { void register_tap_listener_ansi_astat(void) { - register_tap_ui(&ansi_a_stat_ui, NULL); + register_stat_tap_ui(&ansi_a_stat_ui, NULL); } /* diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c index 7dc578ff95..d0810889af 100644 --- a/ui/cli/tap-bootpstat.c +++ b/ui/cli/tap-bootpstat.c @@ -174,7 +174,7 @@ dhcpstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui dhcpstat_ui = { +static stat_tap_ui dhcpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "bootp,stat,", @@ -187,7 +187,7 @@ static tap_ui dhcpstat_ui = { void register_tap_listener_gtkdhcpstat(void) { - register_tap_ui(&dhcpstat_ui, NULL); + register_stat_tap_ui(&dhcpstat_ui, NULL); } /* diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c index 85fe7a05af..3b36f8e19c 100644 --- a/ui/cli/tap-camelcounter.c +++ b/ui/cli/tap-camelcounter.c @@ -118,7 +118,7 @@ static void camelcounter_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui camelcounter_ui = { +static stat_tap_ui camelcounter_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "camel,counter", @@ -131,7 +131,7 @@ static tap_ui camelcounter_ui = { void /* Next line mandatory */ register_tap_listener_camelcounter(void) { - register_tap_ui(&camelcounter_ui, NULL); + register_stat_tap_ui(&camelcounter_ui, NULL); } /* diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index 71a005bef4..d01ee43e98 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -240,7 +240,7 @@ static void camelsrt_init(const char *opt_arg, void *userdata _U_) gcamel_StatSRT = TRUE; } -static tap_ui camelsrt_ui = { +static stat_tap_ui camelsrt_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "camel,srt", @@ -253,7 +253,7 @@ static tap_ui camelsrt_ui = { void /* Next line mandatory */ register_tap_listener_camelsrt(void) { - register_tap_ui(&camelsrt_ui, NULL); + register_stat_tap_ui(&camelsrt_ui, NULL); } /* diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c index 63dfb18cf4..5b8a38a754 100644 --- a/ui/cli/tap-comparestat.c +++ b/ui/cli/tap-comparestat.c @@ -562,7 +562,7 @@ comparestat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui comparestat_ui = { +static stat_tap_ui comparestat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "compare,", @@ -575,7 +575,7 @@ static tap_ui comparestat_ui = { void register_tap_listener_comparestat(void) { - register_tap_ui(&comparestat_ui, NULL); + register_stat_tap_ui(&comparestat_ui, NULL); } /* diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c index 450de0b829..ff305ffce4 100644 --- a/ui/cli/tap-dcerpcstat.c +++ b/ui/cli/tap-dcerpcstat.c @@ -288,7 +288,7 @@ dcerpcstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui dcerpcstat_ui = { +static stat_tap_ui dcerpcstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "dcerpc,srt,", @@ -301,7 +301,7 @@ static tap_ui dcerpcstat_ui = { void register_tap_listener_dcerpcstat(void) { - register_tap_ui(&dcerpcstat_ui, NULL); + register_stat_tap_ui(&dcerpcstat_ui, NULL); } /* diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index 0fe4aa54d2..805cdd0812 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -267,7 +267,7 @@ diameteravp_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui diameteravp_ui = { +static stat_tap_ui diameteravp_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "diameter,avp", @@ -280,7 +280,7 @@ static tap_ui diameteravp_ui = { void register_tap_listener_diameteravp(void) { - register_tap_ui(&diameteravp_ui, NULL); + register_stat_tap_ui(&diameteravp_ui, NULL); } diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index 15dafcac77..8cd0a568c6 100644 --- a/ui/cli/tap-expert.c +++ b/ui/cli/tap-expert.c @@ -262,7 +262,7 @@ static void expert_stat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui expert_stat_ui = { +static stat_tap_ui expert_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "expert", @@ -276,7 +276,7 @@ static tap_ui expert_stat_ui = { void register_tap_listener_expert_info(void) { - register_tap_ui(&expert_stat_ui, NULL); + register_stat_tap_ui(&expert_stat_ui, NULL); } /* diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c index 9b48695666..fb820b07e3 100644 --- a/ui/cli/tap-follow.c +++ b/ui/cli/tap-follow.c @@ -984,7 +984,7 @@ followSsl( } } -static tap_ui followTcp_ui = { +static stat_tap_ui followTcp_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, STR_FOLLOW_TCP, @@ -994,7 +994,7 @@ static tap_ui followTcp_ui = { NULL }; -static tap_ui followUdp_ui = { +static stat_tap_ui followUdp_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, STR_FOLLOW_UDP, @@ -1004,7 +1004,7 @@ static tap_ui followUdp_ui = { NULL }; -static tap_ui followSsl_ui = { +static stat_tap_ui followSsl_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, STR_FOLLOW_SSL, @@ -1017,9 +1017,9 @@ static tap_ui followSsl_ui = { void register_tap_listener_follow(void) { - register_tap_ui(&followTcp_ui, NULL); - register_tap_ui(&followUdp_ui, NULL); - register_tap_ui(&followSsl_ui, NULL); + register_stat_tap_ui(&followTcp_ui, NULL); + register_stat_tap_ui(&followUdp_ui, NULL); + register_stat_tap_ui(&followSsl_ui, NULL); } /* diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index d12902561b..f9a23d197d 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -170,7 +170,7 @@ static void register_menu_cb(const char *name, gpointer callback_data, gboolean retap _U_) { menu_cb_t *mcb = g_malloc(sizeof(menu_cb_t)); - tap_ui ui_info; + stat_tap_ui ui_info; mcb->callback = callback; mcb->callback_data = callback_data; @@ -187,7 +187,7 @@ static void register_menu_cb(const char *name, ui_info.index = -1; ui_info.nparams = 0; ui_info.params = NULL; - register_tap_ui(&ui_info, mcb); + register_stat_tap_ui(&ui_info, mcb); } void initialize_funnel_ops(void) { diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index 5798d67d71..dfa5edda83 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -339,7 +339,7 @@ gsm_a_stat_init(const char *opt_arg _U_, void *userdata _U_) } } -static tap_ui gsm_a_stat_ui = { +static stat_tap_ui gsm_a_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,", @@ -352,7 +352,7 @@ static tap_ui gsm_a_stat_ui = { void register_tap_listener_gsm_astat(void) { - register_tap_ui(&gsm_a_stat_ui, NULL); + register_stat_tap_ui(&gsm_a_stat_ui, NULL); } /* diff --git a/ui/cli/tap-h225counter.c b/ui/cli/tap-h225counter.c index 1310eac1a2..710a47f31d 100644 --- a/ui/cli/tap-h225counter.c +++ b/ui/cli/tap-h225counter.c @@ -370,7 +370,7 @@ h225counter_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui h225counter_ui = { +static stat_tap_ui h225counter_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "h225,counter", @@ -383,7 +383,7 @@ static tap_ui h225counter_ui = { void register_tap_listener_h225counter(void) { - register_tap_ui(&h225counter_ui, NULL); + register_stat_tap_ui(&h225counter_ui, NULL); } /* diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c index 0b39c3a00b..63f307a83d 100644 --- a/ui/cli/tap-h225rassrt.c +++ b/ui/cli/tap-h225rassrt.c @@ -233,7 +233,7 @@ h225rassrt_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui h225rassrt_ui = { +static stat_tap_ui h225rassrt_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "h225,srt", @@ -246,7 +246,7 @@ static tap_ui h225rassrt_ui = { void register_tap_listener_h225rassrt(void) { - register_tap_ui(&h225rassrt_ui, NULL); + register_stat_tap_ui(&h225rassrt_ui, NULL); } /* diff --git a/ui/cli/tap-hosts.c b/ui/cli/tap-hosts.c index 20963b119d..1efe39f911 100644 --- a/ui/cli/tap-hosts.c +++ b/ui/cli/tap-hosts.c @@ -137,7 +137,7 @@ hosts_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui hosts_ui = { +static stat_tap_ui hosts_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, TAP_NAME, @@ -150,7 +150,7 @@ static tap_ui hosts_ui = { void register_tap_listener_hosts(void) { - register_tap_ui(&hosts_ui, NULL); + register_stat_tap_ui(&hosts_ui, NULL); } diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index ee45c6bb06..ce165d6b8f 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -320,7 +320,7 @@ gtk_httpstat_init(const char *opt_arg, void *userdata _U_) http_init_hash(sp); } -static tap_ui httpstat_ui = { +static stat_tap_ui httpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "http,stat,", @@ -333,7 +333,7 @@ static tap_ui httpstat_ui = { void register_tap_listener_gtkhttpstat(void) { - register_tap_ui(&httpstat_ui, NULL); + register_stat_tap_ui(&httpstat_ui, NULL); } /* diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index d18dc61439..87d6602cca 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -309,7 +309,7 @@ icmpstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui icmpstat_ui = { +static stat_tap_ui icmpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "icmp,srt", @@ -322,7 +322,7 @@ static tap_ui icmpstat_ui = { void register_tap_listener_icmpstat(void) { - register_tap_ui(&icmpstat_ui, NULL); + register_stat_tap_ui(&icmpstat_ui, NULL); } /* diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 826d4fdc65..a7a62f34fb 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -310,7 +310,7 @@ icmpv6stat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui icmpv6stat_ui = { +static stat_tap_ui icmpv6stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "icmpv6,srt", @@ -323,7 +323,7 @@ static tap_ui icmpv6stat_ui = { void register_tap_listener_icmpv6stat(void) { - register_tap_ui(&icmpv6stat_ui, NULL); + register_stat_tap_ui(&icmpv6stat_ui, NULL); } /* diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index dd03132727..b771f81e2b 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -1496,7 +1496,7 @@ iostat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui iostat_ui = { +static stat_tap_ui iostat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "io,stat,", @@ -1509,7 +1509,7 @@ static tap_ui iostat_ui = { void register_tap_listener_iostat(void) { - register_tap_ui(&iostat_ui, NULL); + register_stat_tap_ui(&iostat_ui, NULL); } /* diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index ae170b8e59..9bf9c07b3d 100644 --- a/ui/cli/tap-macltestat.c +++ b/ui/cli/tap-macltestat.c @@ -541,7 +541,7 @@ static void mac_lte_stat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui mac_lte_stat_ui = { +static stat_tap_ui mac_lte_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "mac-lte,stat", @@ -555,7 +555,7 @@ static tap_ui mac_lte_stat_ui = { void register_tap_listener_mac_lte_stat(void) { - register_tap_ui(&mac_lte_stat_ui, NULL); + register_stat_tap_ui(&mac_lte_stat_ui, NULL); } /* diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c index 4f843d0e25..d6a97eb3e1 100644 --- a/ui/cli/tap-megacostat.c +++ b/ui/cli/tap-megacostat.c @@ -129,7 +129,7 @@ megacostat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui megacostat_ui = { +static stat_tap_ui megacostat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "megaco,rtd", @@ -144,7 +144,7 @@ register_tap_listener_megacostat(void) { /* We don't register this tap, if we don't have the megaco plugin loaded.*/ if (find_tap_id("megaco")) { - register_tap_ui(&megacostat_ui, NULL); + register_stat_tap_ui(&megacostat_ui, NULL); } } diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c index 413c60acef..85753c89a1 100644 --- a/ui/cli/tap-mgcpstat.c +++ b/ui/cli/tap-mgcpstat.c @@ -213,7 +213,7 @@ mgcpstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui mgcpstat_ui = { +static stat_tap_ui mgcpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "mgcp,rtd", @@ -228,7 +228,7 @@ register_tap_listener_mgcpstat(void) { /* We don't register this tap, if we don't have the mgcp plugin loaded.*/ if (find_tap_id("mgcp")) { - register_tap_ui(&mgcpstat_ui, NULL); + register_stat_tap_ui(&mgcpstat_ui, NULL); } } diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 819da41fda..cabcd1c21a 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -130,7 +130,7 @@ protocolinfo_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui protocolinfo_ui = { +static stat_tap_ui protocolinfo_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "proto,colinfo,", @@ -143,7 +143,7 @@ static tap_ui protocolinfo_ui = { void register_tap_listener_protocolinfo(void) { - register_tap_ui(&protocolinfo_ui, NULL); + register_stat_tap_ui(&protocolinfo_ui, NULL); } /* diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index 77696138ea..1d8b6dc771 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -206,7 +206,7 @@ protohierstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui protohierstat_ui = { +static stat_tap_ui protohierstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "io,phs", @@ -219,7 +219,7 @@ static tap_ui protohierstat_ui = { void register_tap_listener_protohierstat(void) { - register_tap_ui(&protohierstat_ui, NULL); + register_stat_tap_ui(&protohierstat_ui, NULL); } /* diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c index 168c14f136..96aa1ba6f3 100644 --- a/ui/cli/tap-radiusstat.c +++ b/ui/cli/tap-radiusstat.c @@ -229,7 +229,7 @@ radiusstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui radiusstat_ui = { +static stat_tap_ui radiusstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "radius,rtd", @@ -242,7 +242,7 @@ static tap_ui radiusstat_ui = { void register_tap_listener_radiusstat(void) { - register_tap_ui(&radiusstat_ui, NULL); + register_stat_tap_ui(&radiusstat_ui, NULL); } /* diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index c5b44073e0..0eadabeb86 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -402,7 +402,7 @@ static void rlc_lte_stat_init(const char *opt_arg, void *userdata _U_) /* Register this tap listener (need void on own so line register function found) */ -static tap_ui rlc_lte_stat_ui = { +static stat_tap_ui rlc_lte_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rlc-lte,stat", @@ -415,7 +415,7 @@ static tap_ui rlc_lte_stat_ui = { void register_tap_listener_rlc_lte_stat(void) { - register_tap_ui(&rlc_lte_stat_ui, NULL); + register_stat_tap_ui(&rlc_lte_stat_ui, NULL); } /* diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index 0033a95ba5..c7bbd2e7d3 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -225,7 +225,7 @@ rpcprogs_init(const char *opt_arg _U_, void *userdata _U_) } } -static tap_ui rpcprogs_ui = { +static stat_tap_ui rpcprogs_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rpc,programs", @@ -238,7 +238,7 @@ static tap_ui rpcprogs_ui = { void register_tap_listener_rpcprogs(void) { - register_tap_ui(&rpcprogs_ui, NULL); + register_stat_tap_ui(&rpcprogs_ui, NULL); } /* diff --git a/ui/cli/tap-rpcstat.c b/ui/cli/tap-rpcstat.c index 7126a00593..83d090953d 100644 --- a/ui/cli/tap-rpcstat.c +++ b/ui/cli/tap-rpcstat.c @@ -342,7 +342,7 @@ rpcstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui rpcstat_ui = { +static stat_tap_ui rpcstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rpc,srt,", @@ -355,7 +355,7 @@ static tap_ui rpcstat_ui = { void register_tap_listener_rpcstat(void) { - register_tap_ui(&rpcstat_ui, NULL); + register_stat_tap_ui(&rpcstat_ui, NULL); } /* diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c index dd26ff543e..90dd2b19d1 100644 --- a/ui/cli/tap-rtp.c +++ b/ui/cli/tap-rtp.c @@ -152,7 +152,7 @@ rtp_streams_stat_init(const char *opt_arg _U_, void *userdata _U_) } } -static tap_ui rtp_streams_stat_ui = { +static stat_tap_ui rtp_streams_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rtp,streams", @@ -165,7 +165,7 @@ static tap_ui rtp_streams_stat_ui = { void register_tap_listener_rtp_streams(void) { - register_tap_ui(&rtp_streams_stat_ui, NULL); + register_stat_tap_ui(&rtp_streams_stat_ui, NULL); } /* diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index b7972c733a..9b9343bf06 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -273,7 +273,7 @@ gtk_rtspstat_init(const char *opt_arg, void *userdata _U_) rtsp_init_hash(sp); } -static tap_ui rtspstat_ui = { +static stat_tap_ui rtspstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rtsp,stat,", @@ -286,7 +286,7 @@ static tap_ui rtspstat_ui = { void register_tap_listener_gtkrtspstat(void) { - register_tap_ui(&rtspstat_ui, NULL); + register_stat_tap_ui(&rtspstat_ui, NULL); } /* diff --git a/ui/cli/tap-scsistat.c b/ui/cli/tap-scsistat.c index 408be8373e..569ad123be 100644 --- a/ui/cli/tap-scsistat.c +++ b/ui/cli/tap-scsistat.c @@ -251,7 +251,7 @@ scsistat_init(const char *opt_arg, void* userdata _U_) } } -static tap_ui scsistat_ui = { +static stat_tap_ui scsistat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "scsi,srt,", @@ -264,7 +264,7 @@ static tap_ui scsistat_ui = { void register_tap_listener_scsistat(void) { - register_tap_ui(&scsistat_ui, NULL); + register_stat_tap_ui(&scsistat_ui, NULL); } /* diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index 3c3843db93..9641591688 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -241,7 +241,7 @@ sctpstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui sctpstat_ui = { +static stat_tap_ui sctpstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "sctp,stat", @@ -254,7 +254,7 @@ static tap_ui sctpstat_ui = { void register_tap_listener_sctpstat(void) { - register_tap_ui(&sctpstat_ui, NULL); + register_stat_tap_ui(&sctpstat_ui, NULL); } /* diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index be3349d728..8002156798 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -432,7 +432,7 @@ sipstat_init(const char *opt_arg, void *userdata _U_) sip_init_hash(sp); } -static tap_ui sipstat_ui = { +static stat_tap_ui sipstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "sip,stat", @@ -445,7 +445,7 @@ static tap_ui sipstat_ui = { void register_tap_listener_sipstat(void) { - register_tap_ui(&sipstat_ui, NULL); + register_stat_tap_ui(&sipstat_ui, NULL); } /* diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index e5fdc0174a..ee7148bfee 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -85,7 +85,7 @@ smbsids_init(const char *opt_arg _U_, void *userdata _U_) } } -static tap_ui smbsids_ui = { +static stat_tap_ui smbsids_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "smb,sids", @@ -98,7 +98,7 @@ static tap_ui smbsids_ui = { void register_tap_listener_smbsids(void) { - register_tap_ui(&smbsids_ui, NULL); + register_stat_tap_ui(&smbsids_ui, NULL); } /* diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c index 3b6ac34305..b216d2b3df 100644 --- a/ui/cli/tap-smbstat.c +++ b/ui/cli/tap-smbstat.c @@ -246,7 +246,7 @@ smbstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui smbstat_ui = { +static stat_tap_ui smbstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "smb,srt", @@ -259,7 +259,7 @@ static tap_ui smbstat_ui = { void register_tap_listener_smbstat(void) { - register_tap_ui(&smbstat_ui, NULL); + register_stat_tap_ui(&smbstat_ui, NULL); } /* diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c index 62637504f6..88273d0b5d 100644 --- a/ui/cli/tap-stats_tree.c +++ b/ui/cli/tap-stats_tree.c @@ -111,7 +111,7 @@ static void register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_) { stats_tree_cfg *cfg = (stats_tree_cfg *)v; - tap_ui ui_info; + stat_tap_ui ui_info; cfg->pr = (tree_cfg_pres *)g_malloc(sizeof(tree_cfg_pres)); cfg->pr->init_string = g_strdup_printf("%s,tree", cfg->abbr); @@ -123,7 +123,7 @@ register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_) ui_info.index = -1; ui_info.nparams = 0; ui_info.params = NULL; - register_tap_ui(&ui_info, NULL); + register_stat_tap_ui(&ui_info, NULL); } diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 694089da29..eb659e79b8 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -73,7 +73,7 @@ svstat_init(const char *opt_arg _U_, void *userdata _U_) } } -static tap_ui svstat_ui = { +static stat_tap_ui svstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "sv", @@ -86,7 +86,7 @@ static tap_ui svstat_ui = { void register_tap_listener_sv(void) { - register_tap_ui(&svstat_ui, NULL); + register_stat_tap_ui(&svstat_ui, NULL); } /* diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index aae6736f1f..e8ab5669db 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -276,7 +276,7 @@ wspstat_init(const char *opt_arg, void *userdata _U_) } } -static tap_ui wspstat_ui = { +static stat_tap_ui wspstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "wsp,stat,", @@ -289,7 +289,7 @@ static tap_ui wspstat_ui = { void register_tap_listener_wspstat(void) { - register_tap_ui(&wspstat_ui, NULL); + register_stat_tap_ui(&wspstat_ui, NULL); } /* diff --git a/ui/gtk/ansi_map_stat.c b/ui/gtk/ansi_map_stat.c index d282f724dd..2afb16b5f6 100644 --- a/ui/gtk/ansi_map_stat.c +++ b/ui/gtk/ansi_map_stat.c @@ -350,7 +350,7 @@ ansi_map_stat_gtk_init( ansi_map_stat_gtk_cb(NULL, NULL); } -static tap_ui ansi_map_ui = { +static stat_tap_ui ansi_map_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "ansi_map", @@ -381,5 +381,5 @@ register_tap_listener_gtkansi_map_stat(void) exit(1); } - register_tap_ui(&ansi_map_ui, NULL); + register_stat_tap_ui(&ansi_map_ui, NULL); } diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index cf9bffcbd5..888b4f37cf 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -1046,7 +1046,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_) window_present(dlg); } -static tap_ui compare_stat_ui = { +static stat_tap_ui compare_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "compare", @@ -1059,7 +1059,7 @@ static tap_ui compare_stat_ui = { void register_tap_listener_gtkcomparestat(void) { - register_tap_ui(&compare_stat_ui, NULL); + register_stat_tap_ui(&compare_stat_ui, NULL); } /* diff --git a/ui/gtk/dcerpc_stat.c b/ui/gtk/dcerpc_stat.c index ea36ea3edf..d658a26869 100644 --- a/ui/gtk/dcerpc_stat.c +++ b/ui/gtk/dcerpc_stat.c @@ -714,7 +714,7 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) window_present(dlg); } -static tap_ui dcerpcstat_ui = { +static stat_tap_ui dcerpcstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "dcerpc,srt,", @@ -727,5 +727,5 @@ static tap_ui dcerpcstat_ui = { void register_tap_listener_gtkdcerpcstat(void) { - register_tap_ui(&dcerpcstat_ui, NULL); + register_stat_tap_ui(&dcerpcstat_ui, NULL); } diff --git a/ui/gtk/expert_comp_dlg.c b/ui/gtk/expert_comp_dlg.c index 8dc6ceda13..409a4ff987 100644 --- a/ui/gtk/expert_comp_dlg.c +++ b/ui/gtk/expert_comp_dlg.c @@ -1006,7 +1006,7 @@ expert_comp_dlg_launch(void) } } -static tap_ui expert_comp_ui = { +static stat_tap_ui expert_comp_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "expert_comp", @@ -1019,7 +1019,7 @@ static tap_ui expert_comp_ui = { void register_tap_listener_expert_comp(void) { - register_tap_ui(&expert_comp_ui, NULL); + register_stat_tap_ui(&expert_comp_ui, NULL); } void diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index a028849395..5cb780847d 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -395,7 +395,7 @@ flow_graph_launch(GtkAction *action _U_, gpointer user_data _U_) } /****************************************************************************/ -static tap_ui flow_graph_ui = { +static stat_tap_ui flow_graph_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "flow_graph", @@ -408,7 +408,7 @@ static tap_ui flow_graph_ui = { void register_tap_listener_flow_graph(void) { - register_tap_ui(&flow_graph_ui,NULL); + register_stat_tap_ui(&flow_graph_ui,NULL); } /* diff --git a/ui/gtk/gsm_a_stat.c b/ui/gtk/gsm_a_stat.c index fd071f6ee5..2abcaee693 100644 --- a/ui/gtk/gsm_a_stat.c +++ b/ui/gtk/gsm_a_stat.c @@ -627,7 +627,7 @@ gsm_a_stat_gtk_sacch_rr_init( gsm_a_stat_gtk_sacch_rr_cb(NULL, NULL); } -static tap_ui gsm_a_stat_bssmap_ui = { +static stat_tap_ui gsm_a_stat_bssmap_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,bssmap", @@ -637,7 +637,7 @@ static tap_ui gsm_a_stat_bssmap_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_mm_ui = { +static stat_tap_ui gsm_a_stat_dtap_mm_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_mm", @@ -647,7 +647,7 @@ static tap_ui gsm_a_stat_dtap_mm_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_rr_ui = { +static stat_tap_ui gsm_a_stat_dtap_rr_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_rr", @@ -657,7 +657,7 @@ static tap_ui gsm_a_stat_dtap_rr_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_cc_ui = { +static stat_tap_ui gsm_a_stat_dtap_cc_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_cc", @@ -667,7 +667,7 @@ static tap_ui gsm_a_stat_dtap_cc_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_gmm_ui = { +static stat_tap_ui gsm_a_stat_dtap_gmm_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_gmm", @@ -677,7 +677,7 @@ static tap_ui gsm_a_stat_dtap_gmm_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_sms_ui = { +static stat_tap_ui gsm_a_stat_dtap_sms_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_sms", @@ -687,7 +687,7 @@ static tap_ui gsm_a_stat_dtap_sms_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_sm_ui = { +static stat_tap_ui gsm_a_stat_dtap_sm_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_sm", @@ -697,7 +697,7 @@ static tap_ui gsm_a_stat_dtap_sm_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_ss_ui = { +static stat_tap_ui gsm_a_stat_dtap_ss_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_ss", @@ -707,7 +707,7 @@ static tap_ui gsm_a_stat_dtap_ss_ui = { NULL }; -static tap_ui gsm_a_stat_dtap_tp_ui = { +static stat_tap_ui gsm_a_stat_dtap_tp_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,dtap_tp", @@ -717,7 +717,7 @@ static tap_ui gsm_a_stat_dtap_tp_ui = { NULL }; -static tap_ui gsm_a_stat_sacch_rr_ui = { +static stat_tap_ui gsm_a_stat_sacch_rr_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_a,sacch", @@ -749,23 +749,23 @@ register_tap_listener_gtkgsm_a_stat(void) exit(1); } - register_tap_ui(&gsm_a_stat_bssmap_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_bssmap_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_mm_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_mm_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_rr_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_rr_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_cc_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_cc_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_gmm_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_gmm_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_sms_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_sms_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_sm_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_sm_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_ss_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_ss_ui,NULL); - register_tap_ui(&gsm_a_stat_dtap_tp_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_dtap_tp_ui,NULL); - register_tap_ui(&gsm_a_stat_sacch_rr_ui,NULL); + register_stat_tap_ui(&gsm_a_stat_sacch_rr_ui,NULL); } diff --git a/ui/gtk/gsm_map_stat.c b/ui/gtk/gsm_map_stat.c index 7a8d0d9be7..c18423ca5d 100644 --- a/ui/gtk/gsm_map_stat.c +++ b/ui/gtk/gsm_map_stat.c @@ -451,7 +451,7 @@ gsm_map_stat_gtk_init(const char *opt_arg _U_, } -static tap_ui gsm_map_stat_ui = { +static stat_tap_ui gsm_map_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "gsm_map", @@ -483,5 +483,5 @@ register_tap_listener_gtkgsm_map_stat(void) exit(1); } - register_tap_ui(&gsm_map_stat_ui, NULL); + register_stat_tap_ui(&gsm_map_stat_ui, NULL); } diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 463b0d97f7..1920e0b9db 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -3808,7 +3808,7 @@ iax2_analysis_init(const char *dummy _U_,void* userdata _U_) } /****************************************************************************/ -static tap_ui iax2_analysis_ui = { +static stat_tap_ui iax2_analysis_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "IAX2", /* XXX - should be "iax2" */ @@ -3821,7 +3821,7 @@ static tap_ui iax2_analysis_ui = { void register_tap_listener_iax2_analysis(void) { - register_tap_ui(&iax2_analysis_ui,NULL); + register_stat_tap_ui(&iax2_analysis_ui,NULL); } diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c index 36d1185317..97c654fc0d 100644 --- a/ui/gtk/io_stat.c +++ b/ui/gtk/io_stat.c @@ -2170,7 +2170,7 @@ gui_iostat_cb(GtkAction *action _U_, gpointer user_data _U_) iostat_init(NULL,NULL); } -static tap_ui iostat_ui = { +static stat_tap_ui iostat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "io,stat", @@ -2183,5 +2183,5 @@ static tap_ui iostat_ui = { void register_tap_listener_gtk_iostat(void) { - register_tap_ui(&iostat_ui, NULL); + register_stat_tap_ui(&iostat_ui, NULL); } diff --git a/ui/gtk/mtp3_stat.c b/ui/gtk/mtp3_stat.c index 42f02e94da..9a7c4d73ff 100644 --- a/ui/gtk/mtp3_stat.c +++ b/ui/gtk/mtp3_stat.c @@ -420,7 +420,7 @@ mtp3_stat_gtk_init( const char *opt_arg _U_, void* userdata _U_) } -static tap_ui mtp3_stat_ui = { +static stat_tap_ui mtp3_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "mtp3,msus", @@ -451,5 +451,5 @@ register_tap_listener_gtkmtp3_stat(void) exit(1); } - register_tap_ui(&mtp3_stat_ui, NULL); + register_stat_tap_ui(&mtp3_stat_ui, NULL); } diff --git a/ui/gtk/rpc_progs.c b/ui/gtk/rpc_progs.c index c424d0684a..fa54e00304 100644 --- a/ui/gtk/rpc_progs.c +++ b/ui/gtk/rpc_progs.c @@ -426,7 +426,7 @@ gtk_rpcprogs_cb(GtkWidget *w _U_, gpointer data _U_) gtk_rpcprogs_init("", NULL); } -static tap_ui rpcprogs_ui = { +static stat_tap_ui rpcprogs_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rpc,programs", @@ -439,5 +439,5 @@ static tap_ui rpcprogs_ui = { void register_tap_listener_gtkrpcprogs(void) { - register_tap_ui(&rpcprogs_ui, NULL); + register_stat_tap_ui(&rpcprogs_ui, NULL); } diff --git a/ui/gtk/rpc_stat.c b/ui/gtk/rpc_stat.c index 1687c68274..144799fac2 100644 --- a/ui/gtk/rpc_stat.c +++ b/ui/gtk/rpc_stat.c @@ -523,7 +523,7 @@ gtk_rpcstat_cb(GtkAction *action _U_, gpointer user_data _U_) } -static tap_ui rpcstat_ui = { +static stat_tap_ui rpcstat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rpc,srt,", @@ -536,6 +536,6 @@ static tap_ui rpcstat_ui = { void register_tap_listener_gtkrpcstat(void) { - register_tap_ui(&rpcstat_ui, NULL); + register_stat_tap_ui(&rpcstat_ui, NULL); } diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index a669938b5d..4e18fa57c2 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -4044,7 +4044,7 @@ rtp_analysis_init(const char *dummy _U_, void *userdata _U_) } /****************************************************************************/ -static tap_ui rtp_analysis_ui = { +static stat_tap_ui rtp_analysis_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "rtp", @@ -4057,5 +4057,5 @@ static tap_ui rtp_analysis_ui = { void register_tap_listener_rtp_analysis(void) { - register_tap_ui(&rtp_analysis_ui, NULL); + register_stat_tap_ui(&rtp_analysis_ui, NULL); } diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index caee8a6cf3..1ff225cf2c 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -67,7 +67,7 @@ register_param_stat(tap_param_dlg *info, const char *name, { gchar *full_name; const gchar *stock_id = NULL; - tap_ui ui_info; + stat_tap_ui ui_info; /* * This menu item will pop up a dialog box, so append "..." @@ -82,7 +82,7 @@ register_param_stat(tap_param_dlg *info, const char *name, ui_info.index = -1; ui_info.nparams = info->nparams; ui_info.params = info->params; - register_tap_ui(&ui_info, NULL); + register_stat_tap_ui(&ui_info, NULL); switch (group) { diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 528f07154b..576936f266 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -921,7 +921,7 @@ voip_flows_launch(GtkAction *action _U_, gpointer user_data _U_) } /****************************************************************************/ -static tap_ui voip_calls_ui = { +static stat_tap_ui voip_calls_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "voip,calls", @@ -934,6 +934,6 @@ static tap_ui voip_calls_ui = { void register_tap_listener_voip_calls_dlg(void) { - register_tap_ui(&voip_calls_ui, NULL); + register_stat_tap_ui(&voip_calls_ui, NULL); } diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index f032338912..c60ca8d3a7 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -2164,7 +2164,7 @@ io_graph_init(const char *, void*) { wsApp->emitStatCommandSignal("IOGraph", NULL, NULL); } -static tap_ui io_stat_ui = { +static stat_tap_ui io_stat_ui = { REGISTER_STAT_GROUP_GENERIC, NULL, "io,stat", @@ -2178,7 +2178,7 @@ extern "C" { void register_tap_listener_qt_iostat(void) { - register_tap_ui(&io_stat_ui, NULL); + register_stat_tap_ui(&io_stat_ui, NULL); } }