Fix bug #954 for LDAP SRT stats along with the same problem in all the other

SRT code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23640 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c
index bed1501a1b27a6bce4cbc34705248dc594ea10ae..3efcd686793973f4f54ff9e988da70de82bebde4 100644 (file)
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.c
@@ -131,7 +131,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_)
        afpstat_t *ss;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        int i;
        GtkWidget *vbox;
@@ -157,8 +157,10 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("AFP Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+       g_free(filter_string);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("AFP Commands");

diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c
index 23aa8538e5a7c97d7c8c9ae81c3225cd806339ee..4b1d5f44297b719b686a63868b43f2ffd5d38641 100644 (file)
--- a/gtk/camel_srt.c
+++ b/gtk/camel_srt.c
@@ -150,7 +150,7 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
   GtkWidget *cmd_label;
   GtkWidget *main_label;
   GtkWidget *filter_label;
-  char filter_string[256];
+  char *filter_string;
   GString *error_string;
   GtkWidget *vbox;
   GtkWidget *bbox;
@@ -177,8 +177,10 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
   gtk_box_pack_start(GTK_BOX(vbox), main_label, FALSE, FALSE, 0);
   gtk_widget_show(main_label);
 
-  g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+  filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
   filter_label=gtk_label_new(filter_string);
+  g_free(filter_string);
+  gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
   gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
   gtk_widget_show(filter_label);
 

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 485ee5a411ee6ce7ea0774a1f101b69101cfcb91..fbbecd77f88370683c634dd9ccbe60ffcae65845 100644 (file)
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -191,7 +191,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
        rpcstat_t *rs;
        guint32 i, max_procs;
        char *title_string;
-       char filter_string[256];
+       char *filter_string;
        GtkWidget *vbox;
        GtkWidget *stat_label;
        GtkWidget *filter_label;
@@ -275,8 +275,10 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_)
        g_free(title_string);
        gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
        filter_label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
 
        for(i=0,max_procs=0;procs[i].name;i++){

diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 1837901ad4cb696690253a90e0f92ea83e731326..1572b5bece5f916236dab750c8765dfdd392812f 100644 (file)
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -136,7 +136,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_)
        fcstat_t *fc;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        int i;
        GtkWidget *vbox;
@@ -162,8 +162,10 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("Fibre Channel Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("Fibre Channel Types");

diff --git a/gtk/gui_stat_util.c b/gtk/gui_stat_util.c
index c343592666a4205e37b009ed30e7f225b77dfabd..6ace971bffaddbf241bf05096109c0861c70241a 100644 (file)
--- a/gtk/gui_stat_util.c
+++ b/gtk/gui_stat_util.c
@@ -78,7 +78,7 @@ init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const char *title,
 {
        GtkWidget *main_label;
        GtkWidget *filter_label;
-       char filter_string[256];
+       char *filter_string;
 
 
        gtk_window_set_title(GTK_WINDOW(window), title);
@@ -91,8 +91,10 @@ init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, const char *title,
        gtk_box_pack_start(GTK_BOX(mainbox), main_label, FALSE, FALSE, 0);
        gtk_widget_show(main_label);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        filter_label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
        gtk_box_pack_start(GTK_BOX(mainbox), filter_label, FALSE, FALSE, 0);
        gtk_widget_show(filter_label);
 

diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 6bfc24c08f9a919630186a7098a8a53be43caa2e..e288cd5d24a29f731cdb7573ba848f156ebb4120 100644 (file)
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -149,7 +149,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        ldapstat_t *ldap;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        GtkWidget *vbox;
        GtkWidget *bbox;
@@ -174,8 +174,10 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("LDAP Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("LDAP Commands");

diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index fb34fc09d8350ac5603423606f9d8434aa273014..f3eed24eca5d4ddee4b01ea29f7a5b79fa196620 100644 (file)
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -501,7 +501,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_)
     ncpstat_t *ss;
     const char *filter=NULL;
     GtkWidget *label;
-    char filter_string[256];
+    char *filter_string;
     GString *error_string;
     GtkWidget *temp_page;
     GtkWidget *main_nb;
@@ -529,8 +529,10 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_)
     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:"");
+    filter_string = g_strdup_printf("Filter: %s",filter ? filter : "");
     label=gtk_label_new(filter_string);
+    g_free(filter_string);
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
     main_nb = gtk_notebook_new();

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 1db5e726d5d9a1e057e37171f10628ca5bc43f83..0e03bbaa322574b31cedeea959231d27f523391b 100644 (file)
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -221,7 +221,7 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
        rpcstat_t *rs;
        guint32 i;
        char *title_string;
-       char filter_string[256];
+       char *filter_string;
        GtkWidget *vbox;
        GtkWidget *stat_label;
        GtkWidget *filter_label;
@@ -267,8 +267,10 @@ gtk_rpcstat_init(const char *optarg, void* userdata _U_)
        g_free(title_string);
        gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        filter_label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
 
        rpc_min_proc=-1;

diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index f9d6ba137a7717303ea534a1c6de827ccecf421e..53c5104a7b59e238ef8113d4a0d41f3331d8fe4c 100644 (file)
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -178,7 +178,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
        scsistat_t *rs;
        guint32 i;
        char *title_string;
-       char filter_string[256];
+       char *filter_string;
        GtkWidget *vbox;
        GtkWidget *stat_label;
        GtkWidget *filter_label;
@@ -245,8 +245,10 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_)
        g_free(title_string);
        gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        filter_label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(filter_label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
 
        /* We must display TOP LEVEL Widget before calling init_srt_table() */

diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index a7c3838ad86addebff236cf963ed18bffd7b80da..ec086b109e0de1809231a333676635de1fbce5cd 100644 (file)
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -160,7 +160,7 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 {
        int action, type, selection;
        srt_stat_table *rst = (srt_stat_table *)callback_data;
-       char str[256];
+       char *str = NULL;
        const char *current_filter;
 
 
@@ -184,27 +184,32 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
        switch(type){
        case 0:
                /* selected */
-               g_snprintf(str, 255, "%s==%d", rst->filter_string, selection);
+               str = g_strdup_printf("%s==%d", rst->filter_string, selection);
                break;
        case 1:
                /* not selected */
-               g_snprintf(str, 255, "!(%s==%d)", rst->filter_string, selection);
+               str = g_strdup_printf("!(%s==%d)", rst->filter_string,
+                                     selection);
                break;
        case 2:
                /* and selected */
-               g_snprintf(str, 255, "(%s) && (%s==%d)", current_filter, rst->filter_string, selection);
+               str = g_strdup_printf("(%s) && (%s==%d)", current_filter,
+                                     rst->filter_string, selection);
                break;
        case 3:
                /* or selected */
-               g_snprintf(str, 255, "(%s) || (%s==%d)", current_filter, rst->filter_string, selection);
+               str = g_strdup_printf("(%s) || (%s==%d)", current_filter,
+                                     rst->filter_string, selection);
                break;
        case 4:
                /* and not selected */
-               g_snprintf(str, 255, "(%s) && !(%s==%d)", current_filter, rst->filter_string, selection);
+               str = g_strdup_printf("(%s) && !(%s==%d)", current_filter,
+                                     rst->filter_string, selection);
                break;
        case 5:
                /* or not selected */
-               g_snprintf(str, 255, "(%s) || !(%s==%d)", current_filter, rst->filter_string, selection);
+               str = g_strdup_printf("(%s) || !(%s==%d)", current_filter,
+                                     rst->filter_string, selection);
                break;
        }
 
@@ -236,6 +241,7 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
                break;
        }
 
+       g_free(str);
 }
 
 static gint

diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c
index 3d8980fd654c90c39d56daa5e071ee6a087832cb..b7b47ccc06a0828c45eaa033707c1a5f1a7dda1c 100644 (file)
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.c
@@ -134,7 +134,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
        smb2stat_t *ss;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        int i;
        GtkWidget *vbox;
@@ -160,8 +160,10 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("SMB2 Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("SMB2 Commands");

diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index fce90dca1d6f267ca2ef5990143fb43ad43dfd93..e6118ffd70dbf48cf222dbc44c50d8402c71d66b 100644 (file)
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -157,7 +157,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
        smbstat_t *ss;
        const char *filter=NULL;
        GtkWidget *label;
-       char filter_string[256];
+       char *filter_string;
        GString *error_string;
        int i;
        GtkWidget *vbox;
@@ -183,8 +183,10 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_)
        label=gtk_label_new("SMB Service Response Time statistics");
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
-       g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+       filter_string = g_strdup_printf("Filter: %s", filter ? filter : "");
        label=gtk_label_new(filter_string);
+       g_free(filter_string);
+       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
        label=gtk_label_new("SMB Commands");

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index b6e32505a69a11f152e3550f66bda4c5d826b8cf..1bf02bcabde5a198099ed641ed6741f8cca8c141 100644 (file)
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -113,17 +113,20 @@ static void
 tap_dfilter_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
 {
        const char *filter;
-       char str[256];
+       char *str;
        
        tap_dfilter_dlg_list_item *dlg_data = (tap_dfilter_dlg_list_item *) dialog_data;
 
        filter=gtk_entry_get_text(GTK_ENTRY(dlg_data->filter_entry));
        if(filter[0]==0){
-               g_snprintf(str, sizeof(str), "%s", dlg_data->cont.init_string);
+               str = g_strdup_printf("%s", dlg_data->cont.init_string);
        } else {
-               g_snprintf(str, sizeof(str), "%s,%s", dlg_data->cont.init_string, filter);
+               str = g_strdup_printf("%s,%s", dlg_data->cont.init_string,
+                                     filter);
        }
        (dlg_data->cont.tap_init_cb)(str,NULL);
+
+       g_free(str);
 }