aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/afp_stat.c2
-rw-r--r--gtk/bootp_stat.c2
-rw-r--r--gtk/fc_stat.c2
-rw-r--r--gtk/gsm_a_stat.c3
-rw-r--r--gtk/h225_counter.c4
-rw-r--r--gtk/h225_ras_srt.c4
-rw-r--r--gtk/hostlist_ip.c2
-rw-r--r--gtk/ldap_stat.c2
-rw-r--r--gtk/mgcp_stat.c2
-rw-r--r--gtk/ncp_stat.c242
-rw-r--r--gtk/sctp_chunk_stat.c4
-rw-r--r--gtk/sip_stat.c2
-rw-r--r--gtk/smb2_stat.c2
-rw-r--r--gtk/smb_stat.c2
-rw-r--r--gtk/stats_tree_stat.c2
-rw-r--r--gtk/wsp_stat.c2
16 files changed, 140 insertions, 139 deletions
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c
index 4ac518b715..1548dcd740 100644
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.c
@@ -126,7 +126,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_afpstat_init(const char *optarg)
+gtk_afpstat_init(const char *optarg, void *userdata _U_)
{
afpstat_t *ss;
const char *filter=NULL;
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 159ca6ae0c..c4f0a7ddef 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -190,7 +190,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
/* When called, this function will create a new instance of gtk2-dhcpstat.
*/
static void
-dhcpstat_init(const char *optarg)
+dhcpstat_init(const char *optarg, void *userdata _U_)
{
dhcpstat_t *sp;
const char *filter=NULL;
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index d7aaac2dc7..4855b2efe4 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -129,7 +129,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_fcstat_init(const char *optarg)
+gtk_fcstat_init(const char *optarg, void *userdata _U_)
{
fcstat_t *fc;
const char *filter=NULL;
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index d426f73c46..3775db98ef 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -653,7 +653,8 @@ gsm_a_stat_gtk_dtap_ss_cb(
static void
gsm_a_stat_gtk_dtap_ss_init(
- const char *optarg _U_)
+ const char *optarg _U_,
+ void *userdata _U_)
{
gsm_a_stat_gtk_dtap_ss_cb(NULL, NULL);
}
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 7db154e6cf..c84685245e 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -53,7 +53,7 @@
#include "gui_utils.h"
-static void gtk_h225counter_init(const char *optarg);
+static void gtk_h225counter_init(const char *optarg, void *userdata);
static tap_dfilter_dlg h225_counter_dlg = {
"H.225 Messages and Message Reasons",
@@ -501,7 +501,7 @@ static const gchar *titles[]={
"Count" };
static void
-gtk_h225counter_init(const char *optarg)
+gtk_h225counter_init(const char *optarg, void *userdata _U_)
{
h225counter_t *hs;
const char *filter=NULL;
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 391f5e9a3d..e053b3e20f 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -54,7 +54,7 @@
#include "gui_utils.h"
-static void gtk_h225rassrt_init(const char *optarg);
+static void gtk_h225rassrt_init(const char *optarg, void *userdata);
static tap_dfilter_dlg h225_rassrt_dlg = {
"H.225 RAS Service Response Time",
@@ -281,7 +281,7 @@ static const gchar *titles[]={
"Repeated Responses" };
static void
-gtk_h225rassrt_init(const char *optarg)
+gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
{
h225rassrt_t *hs;
const char *filter=NULL;
diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index b369e9204b..e1b1cfe765 100644
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.c
@@ -59,7 +59,7 @@ ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const
}
static void
-gtk_ip_hostlist_init(const char *optarg, void* userdata)
+gtk_ip_hostlist_init(const char *optarg, void* userdata _U_)
{
const char *filter=NULL;
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 96fd375831..954d50b319 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -144,7 +144,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_ldapstat_init(const char *optarg)
+gtk_ldapstat_init(const char *optarg, void *userdata _U_)
{
ldapstat_t *ldap;
const char *filter=NULL;
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 2665435019..6705322658 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -251,7 +251,7 @@ static const gchar *titles[]={
"Max in Frame" };
static void
-gtk_mgcpstat_init(const char *optarg)
+gtk_mgcpstat_init(const char *optarg, void *userdata _U_)
{
mgcpstat_t *ms;
const char *filter=NULL;
diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index d3cbecd8d8..f5a6fa6873 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -448,42 +448,42 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_ncpstat_init(const char *optarg)
+gtk_ncpstat_init(const char *optarg, void *userdata _U_)
{
- ncpstat_t *ss;
- const char *filter=NULL;
- GtkWidget *label;
- char filter_string[256];
- GString *error_string;
+ ncpstat_t *ss;
+ const char *filter=NULL;
+ GtkWidget *label;
+ char filter_string[256];
+ GString *error_string;
GtkWidget *temp_page;
GtkWidget *main_nb;
- GtkWidget *vbox;
- GtkWidget *bbox;
- GtkWidget *close_bt;
-
- if(!strncmp(optarg,"ncp,srt,",8)){
- filter=optarg+8;
- } else {
- filter=NULL;
- }
+ GtkWidget *vbox;
+ GtkWidget *bbox;
+ GtkWidget *close_bt;
+
+ if(!strncmp(optarg,"ncp,srt,",8)){
+ filter=optarg+8;
+ } else {
+ filter=NULL;
+ }
- ss=g_malloc(sizeof(ncpstat_t));
+ ss=g_malloc(sizeof(ncpstat_t));
- ss->win=window_new(GTK_WINDOW_TOPLEVEL, "ncp-stat");
- gtk_window_set_default_size(GTK_WINDOW(ss->win), 300, 400);
+ ss->win=window_new(GTK_WINDOW_TOPLEVEL, "ncp-stat");
+ gtk_window_set_default_size(GTK_WINDOW(ss->win), 300, 400);
- ncpstat_set_title(ss);
+ ncpstat_set_title(ss);
- vbox=gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(ss->win), vbox);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
+ vbox=gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(ss->win), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
- label=gtk_label_new("NCP Service Response Time Statistics");
- gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+ label=gtk_label_new("NCP Service Response Time Statistics");
+ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
- g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
- label=gtk_label_new(filter_string);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+ label=gtk_label_new(filter_string);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
main_nb = gtk_notebook_new();
gtk_box_pack_start(GTK_BOX(vbox), main_nb, TRUE, TRUE, 0);
@@ -491,182 +491,182 @@ gtk_ncpstat_init(const char *optarg)
label = gtk_label_new("Groups");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- /* NCP Groups */
+ /* NCP Groups */
/* We must display TOP LEVEL Widget before calling init_srt_table() */
- gtk_widget_show_all(ss->win);
- label=gtk_label_new("NCP by Group Type");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ gtk_widget_show_all(ss->win);
+ label=gtk_label_new("NCP by Group Type");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
init_srt_table(&ss->ncp_srt_table, 256, temp_page, "ncp.group");
/* NCP Functions */
temp_page = gtk_vbox_new(FALSE, 6);
label = gtk_label_new("Functions");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("NCP Functions without Subfunctions");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->func_srt_table, 256, temp_page, "ncp.func");
+ label=gtk_label_new("NCP Functions without Subfunctions");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->func_srt_table, 256, temp_page, "ncp.func");
- /* NCP Subfunctions */
+ /* NCP Subfunctions */
temp_page = gtk_vbox_new(FALSE, 6);
label = gtk_label_new("17");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 17");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_17_srt_table, 256, temp_page, "ncp.func==17 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 17");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_17_srt_table, 256, temp_page, "ncp.func==17 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("21");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 21");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_21_srt_table, 256, temp_page, "ncp.func==21 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 21");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_21_srt_table, 256, temp_page, "ncp.func==21 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("22");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 22");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_22_srt_table, 256, temp_page, "ncp.func==22 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 22");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_22_srt_table, 256, temp_page, "ncp.func==22 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("23");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 23");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_23_srt_table, 256, temp_page, "ncp.func==23 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 23");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_23_srt_table, 256, temp_page, "ncp.func==23 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("32");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 32");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_32_srt_table, 256, temp_page, "ncp.func==32 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 32");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_32_srt_table, 256, temp_page, "ncp.func==32 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("34");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 34");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_34_srt_table, 256, temp_page, "ncp.func==34 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 34");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_34_srt_table, 256, temp_page, "ncp.func==34 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("35");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 35");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_35_srt_table, 256, temp_page, "ncp.func==35 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 35");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_35_srt_table, 256, temp_page, "ncp.func==35 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("36");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 36");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_36_srt_table, 256, temp_page, "ncp.func==36 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 36");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_36_srt_table, 256, temp_page, "ncp.func==36 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("86");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 86");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_86_srt_table, 256, temp_page, "ncp.func==86 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 86");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_86_srt_table, 256, temp_page, "ncp.func==86 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("87");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 87");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_87_srt_table, 256, temp_page, "ncp.func==87 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 87");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_87_srt_table, 256, temp_page, "ncp.func==87 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("89");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 89 (Extended NCP's with UTF8 Support)");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_89_srt_table, 256, temp_page, "ncp.func==89 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 89 (Extended NCP's with UTF8 Support)");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_89_srt_table, 256, temp_page, "ncp.func==89 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("90");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 90");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_90_srt_table, 256, temp_page, "ncp.func==90 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 90");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_90_srt_table, 256, temp_page, "ncp.func==90 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("92");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 92 (Secret Store Services)");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_92_srt_table, 256, temp_page, "ncp.func==92 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 92 (Secret Store Services)");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_92_srt_table, 256, temp_page, "ncp.func==92 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("94");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 94 (Novell Modular Authentication Services)");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_94_srt_table, 256, temp_page, "ncp.func==94 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 94 (Novell Modular Authentication Services)");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_94_srt_table, 256, temp_page, "ncp.func==94 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("104");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 104");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_104_srt_table, 256, temp_page, "ncp.func==104 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 104");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_104_srt_table, 256, temp_page, "ncp.func==104 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("111");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 111");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_111_srt_table, 256, temp_page, "ncp.func==111 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 111");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_111_srt_table, 256, temp_page, "ncp.func==111 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("114");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 114");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_114_srt_table, 256, temp_page, "ncp.func==114 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 114");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_114_srt_table, 256, temp_page, "ncp.func==114 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("123");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 123");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_123_srt_table, 256, temp_page, "ncp.func==123 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 123");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_123_srt_table, 256, temp_page, "ncp.func==123 && ncp.subfunc");
temp_page = gtk_vbox_new(FALSE, 6);
label=gtk_label_new("131");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Subfunctions for NCP 131");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sub_131_srt_table, 256, temp_page, "ncp.func==131 && ncp.subfunc");
+ label=gtk_label_new("Subfunctions for NCP 131");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sub_131_srt_table, 256, temp_page, "ncp.func==131 && ncp.subfunc");
/* NDS Verbs */
temp_page = gtk_vbox_new(FALSE, 6);
- label=gtk_label_new("NDS");
+ label=gtk_label_new("NDS");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("NDS Verbs");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->nds_srt_table, 256, temp_page, "ncp.ndsverb");
+ label=gtk_label_new("NDS Verbs");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->nds_srt_table, 256, temp_page, "ncp.ndsverb");
/* Secret Store Verbs */
temp_page = gtk_vbox_new(FALSE, 6);
- label=gtk_label_new("SSS");
+ label=gtk_label_new("SSS");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("Secret Store Verbs");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->sss_srt_table, 256, temp_page, "sss.subverb");
+ label=gtk_label_new("Secret Store Verbs");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->sss_srt_table, 256, temp_page, "sss.subverb");
/* NMAS Verbs */
temp_page = gtk_vbox_new(FALSE, 6);
- label=gtk_label_new("NMAS");
+ label=gtk_label_new("NMAS");
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, label);
- label=gtk_label_new("NMAS Verbs");
- gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
- init_srt_table(&ss->nmas_srt_table, 256, temp_page, "nmas.subverb");
+ label=gtk_label_new("NMAS Verbs");
+ gtk_box_pack_start(GTK_BOX(temp_page), label, FALSE, FALSE, 0);
+ init_srt_table(&ss->nmas_srt_table, 256, temp_page, "nmas.subverb");
/* Register the tap listener */
- error_string=register_tap_listener("ncp_srt", ss, filter, ncpstat_reset, ncpstat_packet, ncpstat_draw);
- if(error_string){
- simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
- g_string_free(error_string, TRUE);
- g_free(ss);
- return;
- }
+ error_string=register_tap_listener("ncp_srt", ss, filter, ncpstat_reset, ncpstat_packet, ncpstat_draw);
+ if(error_string){
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str);
+ g_string_free(error_string, TRUE);
+ g_free(ss);
+ return;
+ }
+
+ /* Button row. */
+ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
- /* Button row. */
- bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+ close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+ window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
- close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
- window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
+ SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL);
+ SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);
- SIGNAL_CONNECT(ss->win, "delete_event", window_delete_event_cb, NULL);
- SIGNAL_CONNECT(ss->win, "destroy", win_destroy_cb, ss);
+ gtk_widget_show_all(ss->win);
+ window_present(ss->win);
- gtk_widget_show_all(ss->win);
- window_present(ss->win);
-
cf_redissect_packets(&cfile);
}
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index 145f0e68a7..d4c8a3f5f7 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -54,7 +54,7 @@
#include "gui_utils.h"
-static void sctpstat_init(const char *optarg);
+static void sctpstat_init(const char *optarg, void *userdata);
static tap_dfilter_dlg sctp_stat_dlg = {
"SCTP Statistics",
@@ -279,7 +279,7 @@ static const gchar *titles[]={
"ERROR" };
static void
-sctpstat_init(const char *optarg)
+sctpstat_init(const char *optarg, void *userdata _U_)
{
sctpstat_t *hs;
const char *filter=NULL;
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 8799b6bf0a..d3e98c2ad4 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -497,7 +497,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
/* Create a new instance of gtk_sipstat. */
static void
-gtk_sipstat_init(const char *optarg)
+gtk_sipstat_init(const char *optarg, void *userdata _U_)
{
sipstat_t *sp;
const char *filter = NULL;
diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c
index 8d61302d9b..76b87900ce 100644
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.c
@@ -129,7 +129,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_smb2stat_init(const char *optarg)
+gtk_smb2stat_init(const char *optarg, void *userdata _U_)
{
smb2stat_t *ss;
const char *filter=NULL;
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 4c22787482..1608f3c838 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -151,7 +151,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
static void
-gtk_smbstat_init(const char *optarg)
+gtk_smbstat_init(const char *optarg, void *userdata _U_)
{
smbstat_t *ss;
const char *filter=NULL;
diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index 19f11255d8..b25da931ca 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.c
@@ -204,7 +204,7 @@ static void reset_tap(void* p) {
}
/* initializes the stats_tree window */
-static void init_gtk_tree(const char* optarg) {
+static void init_gtk_tree(const char* optarg, void *userdata _U_) {
guint8* abbr = stats_tree_get_abbr(optarg);
stats_tree* st = NULL;
stats_tree_cfg* cfg = NULL;
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index f8d612ca26..b7830223d2 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -303,7 +303,7 @@ wsp_init_table(wspstat_t *sp)
/* When called, this function will create a new instance of gtk2-wspstat.
*/
static void
-gtk_wspstat_init(const char *optarg)
+gtk_wspstat_init(const char *optarg, void *userdata _U_)
{
wspstat_t *sp;
const char *filter=NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 11:54:40 +0000