diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/afp_stat.c | 6 | ||||
-rw-r--r-- | gtk/camel_srt.c | 6 | ||||
-rw-r--r-- | gtk/dcerpc_stat.c | 6 | ||||
-rw-r--r-- | gtk/fc_stat.c | 6 | ||||
-rw-r--r-- | gtk/gui_stat_util.c | 6 | ||||
-rw-r--r-- | gtk/ldap_stat.c | 6 | ||||
-rw-r--r-- | gtk/ncp_stat.c | 6 | ||||
-rw-r--r-- | gtk/rpc_stat.c | 6 | ||||
-rw-r--r-- | gtk/scsi_stat.c | 6 | ||||
-rw-r--r-- | gtk/service_response_time_table.c | 20 | ||||
-rw-r--r-- | gtk/smb2_stat.c | 6 | ||||
-rw-r--r-- | gtk/smb_stat.c | 6 | ||||
-rw-r--r-- | gtk/tap_dfilter_dlg.c | 9 |
13 files changed, 63 insertions, 32 deletions
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c index bed1501a1b..3efcd68679 100644 --- 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 23aa8538e5..4b1d5f4429 100644 --- 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 485ee5a411..fbbecd77f8 100644 --- 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 1837901ad4..1572b5bece 100644 --- 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 c343592666..6ace971bff 100644 --- 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 6bfc24c08f..e288cd5d24 100644 --- 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 fb34fc09d8..f3eed24eca 100644 --- 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 1db5e726d5..0e03bbaa32 100644 --- 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 f9d6ba137a..53c5104a7b 100644 --- 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 a7c3838ad8..ec086b109e 100644 --- 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 3d8980fd65..b7b47ccc06 100644 --- 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 fce90dca1d..e6118ffd70 100644 --- 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 b6e32505a6..1bf02bcabd 100644 --- 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); } |