diff options
73 files changed, 81 insertions, 82 deletions
diff --git a/epan/Makefile.common b/epan/Makefile.common index 99578cb212..b2fd686aaf 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -60,16 +60,16 @@ LIBETHEREAL_SRC = \ prefs.c \ proto.c \ ptvcursor.c \ - radius_dict.c \ + radius_dict.c \ range.c \ reassemble.c \ req_resp_hdrs.c \ sha1.c \ sigcomp_state_hdlr.c \ - sigcomp-udvm.c \ + sigcomp-udvm.c \ sminmpec.c \ sna-utils.c \ - stat.c \ + stat_cmd_args.c \ stats_tree.c \ strutil.c \ t35.c \ @@ -133,11 +133,11 @@ LIBETHEREAL_INCLUDES = \ req_resp_hdrs.h \ sha1.h \ sigcomp_state_hdlr.h \ - sigcomp-udvm.h \ + sigcomp-udvm.h \ slab.h \ sminmpec.h \ sna-utils.h \ - stat.h \ + stat_cmd_args.h \ stats_tree.h \ stats_tree_priv.h \ strutil.h \ diff --git a/epan/stat.c b/epan/stat_cmd_args.c index 06d5585e65..434b09c1b5 100644 --- a/epan/stat.c +++ b/epan/stat_cmd_args.c @@ -1,6 +1,5 @@ -/* stat.c - * Routines to register "-z" command-line argument or Statistics menu item - * handlers +/* stat_cmd_args.c + * Routines to register "-z" command-line argument handlers for stats * * $Id$ * @@ -33,7 +32,7 @@ #include <glib.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> /* structure to keep track of what stats have registered command-line arguments. diff --git a/epan/stat.h b/epan/stat_cmd_args.h index 31f81b4611..d0314f5405 100644 --- a/epan/stat.h +++ b/epan/stat_cmd_args.h @@ -1,6 +1,6 @@ -/* stat.h - * Declarations of routines to register "-z" command-line argument or - * Statistics menu item handlers +/* stat_cmd_args.h + * Declarations of routines to register "-z" command-line argument handlers + * for stats * * $Id$ * diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c index 1b6772ab9f..d0c77a791c 100644 --- a/gtk/afp_stat.c +++ b/gtk/afp_stat.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include <epan/dissectors/packet-afp.h> diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index 9e3f26b7fc..ca2998f537 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index 50dbfa90e2..96ad9efc06 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index 7821e5b14b..bf90b5a6cb 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -33,7 +33,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "simple_dialog.h" #include "gui_utils.h" diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c index 5488f836b5..af670ff4a9 100644 --- a/gtk/conversations_eth.c +++ b/gtk/conversations_eth.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c index 6f0e511ac7..978a68e71f 100644 --- a/gtk/conversations_fc.c +++ b/gtk/conversations_fc.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c index f507f0000d..cae1be98f0 100644 --- a/gtk/conversations_fddi.c +++ b/gtk/conversations_fddi.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_ip.c b/gtk/conversations_ip.c index 0e6cb9e4e9..5c4f58179d 100644 --- a/gtk/conversations_ip.c +++ b/gtk/conversations_ip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c index e28ddf8aca..ba361a6f7f 100644 --- a/gtk/conversations_ipx.c +++ b/gtk/conversations_ipx.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c index e5edb7ec8a..d28c75a775 100644 --- a/gtk/conversations_jxta.c +++ b/gtk/conversations_jxta.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c index 5f5ee2c87e..6fd15d8e49 100644 --- a/gtk/conversations_sctp.c +++ b/gtk/conversations_sctp.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c index dce02e3b82..d0072b17f8 100644 --- a/gtk/conversations_tcpip.c +++ b/gtk/conversations_tcpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c index da6b281e2e..cca32afdcf 100644 --- a/gtk/conversations_tr.c +++ b/gtk/conversations_tr.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c index 6ffd2d7012..0163aef051 100644 --- a/gtk/conversations_udpip.c +++ b/gtk/conversations_udpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c index a1f6c90980..e0a2dda029 100644 --- a/gtk/conversations_wlan.c +++ b/gtk/conversations_wlan.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index b473c479d4..ee67f3ee98 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -40,7 +40,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index a470b67ed5..052fed0b0f 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include <epan/dissectors/packet-fc.h> diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index 5acdb8cfa2..405a4c2b55 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -33,7 +33,7 @@ #include "epan/filesystem.h" #include "graph_analysis.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "dlg_utils.h" #include "gui_utils.h" diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 495efadbed..a4d647280c 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index 715aad80cf..336b21ec07 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 8fa95e63ee..e94a55266c 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 5c04136806..6203bff88c 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c index ad5fda1548..a5bdaad93f 100644 --- a/gtk/hostlist_eth.c +++ b/gtk/hostlist_eth.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c index 41dc057b95..8e5cbb3288 100644 --- a/gtk/hostlist_fc.c +++ b/gtk/hostlist_fc.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c index cd26d6682a..9eb82d9b22 100644 --- a/gtk/hostlist_fddi.c +++ b/gtk/hostlist_fddi.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c index 281e8dfe52..370e76216b 100644 --- a/gtk/hostlist_ip.c +++ b/gtk/hostlist_ip.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c index c850f177aa..792d8e4c2d 100644 --- a/gtk/hostlist_ipx.c +++ b/gtk/hostlist_ipx.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c index 14d37340ae..ca2c053225 100644 --- a/gtk/hostlist_jxta.c +++ b/gtk/hostlist_jxta.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c index c87761d5d7..4daef99b9f 100644 --- a/gtk/hostlist_tcpip.c +++ b/gtk/hostlist_tcpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c index 8f5535e9c4..81486605cd 100644 --- a/gtk/hostlist_tr.c +++ b/gtk/hostlist_tr.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c index ccec1a8161..2d6db2a6e9 100644 --- a/gtk/hostlist_udpip.c +++ b/gtk/hostlist_udpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c index 6c114ed6c6..f57326d3cf 100644 --- a/gtk/hostlist_wlan.c +++ b/gtk/hostlist_wlan.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 100b5e934f..900552e6b7 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -42,7 +42,7 @@ #include "gtkglobals.h" #include "gui_utils.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index f9428e3754..83d1e56d73 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include <epan/dissectors/packet-ldap.h> diff --git a/gtk/main.c b/gtk/main.c index 351bf1347a..9d782b5966 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -83,7 +83,7 @@ #include "ringbuffer.h" #include "../ui_util.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "util.h" #include "clopts_common.h" #include "version_info.h" diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 634a5a5ce9..3349232963 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 8bcf0b275a..8f49d5d493 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index f64c2c12e5..296e98c121 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -37,7 +37,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 53decfc517..2edc7d961c 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -37,7 +37,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "simple_dialog.h" #include "gui_utils.h" diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 02321d0540..b87bb9d1bd 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -63,7 +63,7 @@ #include <gtk/gtk.h> #include "gtkglobals.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "dlg_utils.h" #include "gui_utils.h" #include "alert_box.h" diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index a598adb2f4..ea657c4fb5 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -33,7 +33,7 @@ #include "rtp_stream_dlg.h" #include "globals.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/tap.h> #include "register.h" diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index 0006515097..f425f47396 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -40,7 +40,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 048c5b70ac..57c052970b 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -32,7 +32,7 @@ #include "globals.h" #include "epan/packet_info.h" /* Needed for packet_info */ #include <epan/tap.h> /* Needed for register_tap_listener */ -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "dlg_utils.h" #include "compat_macros.h" diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index e6ba9a8628..e838fb6a17 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -34,7 +34,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "simple_dialog.h" #include "gui_utils.h" diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 830471e432..b9aace599f 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include <epan/tap.h> #include "../smb.h" diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index 7794a045b2..babd2048c1 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -34,7 +34,7 @@ #include "simple_dialog.h" #include "globals.h" -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "gui_utils.h" #include "dlg_utils.h" diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 4e1a970a3e..a1c14cd1fe 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -50,7 +50,7 @@ #include "epan/filesystem.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "dlg_utils.h" #include "gui_utils.h" diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 631a26c698..f3bb4ce36d 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -34,7 +34,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "stat_menu.h" #include "simple_dialog.h" #include "gui_utils.h" diff --git a/tap-afpstat.c b/tap-afpstat.c index 27341e6d6c..bedee12f1a 100644 --- a/tap-afpstat.c +++ b/tap-afpstat.c @@ -36,7 +36,7 @@ #include <string.h> #include <epan/packet_info.h> #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/value_string.h> #include <epan/dissectors/packet-afp.h> #include "register.h" diff --git a/tap-ansi_astat.c b/tap-ansi_astat.c index 83a594601e..8b285eaa70 100644 --- a/tap-ansi_astat.c +++ b/tap-ansi_astat.c @@ -42,7 +42,7 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-ansi_a.h> #include "register.h" diff --git a/tap-bootpstat.c b/tap-bootpstat.c index a36ad7aeb7..10a3d11aac 100644 --- a/tap-bootpstat.c +++ b/tap-bootpstat.c @@ -31,7 +31,7 @@ #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c index 06f8989c1b..f87849a63f 100644 --- a/tap-dcerpcstat.c +++ b/tap-dcerpcstat.c @@ -35,7 +35,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-dcerpc.h> #include "register.h" diff --git a/tap-gsm_astat.c b/tap-gsm_astat.c index 4b0214409e..3d90d7c45d 100644 --- a/tap-gsm_astat.c +++ b/tap-gsm_astat.c @@ -42,7 +42,7 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-gsm_a.h> #include "register.h" diff --git a/tap-h225counter.c b/tap-h225counter.c index 4ccc0c821f..694cffae8a 100644 --- a/tap-h225counter.c +++ b/tap-h225counter.c @@ -36,7 +36,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "register.h" #include <epan/dissectors/packet-h225.h> diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c index 4f6e79425b..937edc1480 100644 --- a/tap-h225rassrt.c +++ b/tap-h225rassrt.c @@ -36,7 +36,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "register.h" #include <epan/dissectors/packet-h225.h> diff --git a/tap-httpstat.c b/tap-httpstat.c index 316858607c..e957588b0d 100644 --- a/tap-httpstat.c +++ b/tap-httpstat.c @@ -32,7 +32,7 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" #include <epan/dissectors/packet-http.h> diff --git a/tap-iostat.c b/tap-iostat.c index 4efdf45540..afe1740a20 100644 --- a/tap-iostat.c +++ b/tap-iostat.c @@ -36,7 +36,7 @@ #include "epan/epan_dissect.h" #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" diff --git a/tap-iousers.c b/tap-iousers.c index 75e70f2dfa..2ae1e96359 100644 --- a/tap-iousers.c +++ b/tap-iousers.c @@ -37,7 +37,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" #include <epan/dissectors/packet-ip.h> #include <epan/dissectors/packet-ipx.h> diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c index 0771491813..acd1980ae1 100644 --- a/tap-mgcpstat.c +++ b/tap-mgcpstat.c @@ -35,7 +35,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "register.h" #include "plugins/mgcp/packet-mgcp.h" diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c index ab42594915..701d0ffc14 100644 --- a/tap-protocolinfo.c +++ b/tap-protocolinfo.c @@ -39,7 +39,7 @@ #include "epan/column-utils.h" #include "epan/proto.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" typedef struct _pci_t { diff --git a/tap-protohierstat.c b/tap-protohierstat.c index 7913819ebe..fd8238a88c 100644 --- a/tap-protohierstat.c +++ b/tap-protohierstat.c @@ -39,7 +39,7 @@ #include "epan/epan_dissect.h" #include "epan/proto.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" typedef struct _phs_t { diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c index 9fec2448f0..51fc6a160e 100644 --- a/tap-rpcprogs.c +++ b/tap-rpcprogs.c @@ -39,7 +39,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-rpc.h> #include "register.h" diff --git a/tap-rpcstat.c b/tap-rpcstat.c index ab9d82a06d..48d78fe0cb 100644 --- a/tap-rpcstat.c +++ b/tap-rpcstat.c @@ -41,7 +41,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/dissectors/packet-rpc.h> #include "register.h" diff --git a/tap-sctpchunkstat.c b/tap-sctpchunkstat.c index 20cc850cb3..c5b61fb68b 100644 --- a/tap-sctpchunkstat.c +++ b/tap-sctpchunkstat.c @@ -37,7 +37,7 @@ #include "epan/packet_info.h" #include "epan/addr_resolv.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "register.h" #include <epan/dissectors/packet-sctp.h> diff --git a/tap-sipstat.c b/tap-sipstat.c index 79c9418498..be943031ff 100644 --- a/tap-sipstat.c +++ b/tap-sipstat.c @@ -36,7 +36,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "register.h" #include <epan/dissectors/packet-sip.h> diff --git a/tap-smbsids.c b/tap-smbsids.c index 5c1bc2c407..b9319e6bf1 100644 --- a/tap-smbsids.c +++ b/tap-smbsids.c @@ -37,7 +37,7 @@ #include <epan/dissectors/packet-smb-sidsnooping.h> #include "register.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "smb.h" diff --git a/tap-smbstat.c b/tap-smbstat.c index 9c7d707349..8173efd656 100644 --- a/tap-smbstat.c +++ b/tap-smbstat.c @@ -35,7 +35,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "epan/value_string.h" #include "smb.h" #include "register.h" diff --git a/tap-stats_tree.c b/tap-stats_tree.c index 2e528e160f..5c40acd367 100644 --- a/tap-stats_tree.c +++ b/tap-stats_tree.c @@ -31,7 +31,7 @@ #include <stdio.h> #include <glib.h> #include <epan/stats_tree_priv.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> /* actually unused */ struct _st_node_pres { diff --git a/tap-wspstat.c b/tap-wspstat.c index 70ab019a08..1e77dd4657 100644 --- a/tap-wspstat.c +++ b/tap-wspstat.c @@ -40,7 +40,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include "register.h" #include "epan/value_string.h" #include <epan/dissectors/packet-wsp.h> diff --git a/tethereal.c b/tethereal.c index 89060641f1..9f1324a329 100644 --- a/tethereal.c +++ b/tethereal.c @@ -84,7 +84,7 @@ #include "capture_ui_utils.h" #include <epan/epan_dissect.h> #include <epan/tap.h> -#include <epan/stat.h> +#include <epan/stat_cmd_args.h> #include <epan/timestamp.h> #ifdef HAVE_LIBPCAP |