diff options
39 files changed, 64 insertions, 64 deletions
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c index 7d6e4a6277..e857a8e048 100644 --- a/gtk/afp_stat.c +++ b/gtk/afp_stat.c @@ -175,7 +175,7 @@ gtk_afpstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("afp", ss, filter, afpstat_reset, afpstat_packet, afpstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ss); return; diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index 9d528a6345..dba35c7c58 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -476,7 +476,7 @@ register_tap_listener_gtkansi_a_stat(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_p->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_p->str); g_string_free(err_p, TRUE); exit(1); diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index c0b7b718dd..9db837d520 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -439,7 +439,7 @@ register_tap_listener_gtkansi_map_stat(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_p->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_p->str); g_string_free(err_p, TRUE); exit(1); diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index 4e499c3c16..d64541749f 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -246,7 +246,7 @@ dhcpstat_init(const char *optarg, void *userdata _U_) dhcpstat_draw); if (error_string){ /* error, we failed to attach to the tap. clean up */ - simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str ); + simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str ); g_free(sp->filter); g_free(sp); g_string_free(error_string, TRUE); diff --git a/gtk/camel_counter.c b/gtk/camel_counter.c index 95bd6f07f1..40193d2126 100644 --- a/gtk/camel_counter.c +++ b/gtk/camel_counter.c @@ -195,7 +195,7 @@ static void gtk_camelcounter_init(const char *optarg, void *userdata _U_) } if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(p_camelcounter); return; diff --git a/gtk/camel_srt.c b/gtk/camel_srt.c index 9b99a352d2..7a721d61e4 100644 --- a/gtk/camel_srt.c +++ b/gtk/camel_srt.c @@ -216,7 +216,7 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_) } if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(p_camelsrt); return; diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c index 0aeeb2e104..fcdf587ad2 100644 --- a/gtk/conversations_table.c +++ b/gtk/conversations_table.c @@ -305,7 +305,7 @@ reset_ct_table_data(conversations_table *ct) error_string = set_tap_dfilter (ct, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; } @@ -1296,7 +1296,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean /* register the tap and rerun the taps on the packet list */ error_string=register_tap_listener(tap_name, conversations, filter, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return FALSE; } diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 072c1b6947..c34e1e7b97 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -316,7 +316,7 @@ gtk_dcerpcstat_init(const char *optarg, void* userdata _U_) error_string=register_tap_listener("dcerpc", rs, filter, dcerpcstat_reset, dcerpcstat_packet, dcerpcstat_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); free_srt_table_data(&rs->srt_table); g_free(rs); diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c index 5a1121c143..8353232c45 100644 --- a/gtk/drag_and_drop.c +++ b/gtk/drag_and_drop.c @@ -269,7 +269,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) } g_string_append(dialog_text, "\nThe packets in these files will be merged chronologically into a new temporary file."); dialog = simple_dialog(ESD_TYPE_CONFIRMATION, - ESD_BTN_OK, + ESD_BTN_OK, "%s", dialog_text->str); g_string_free(dialog_text, TRUE); diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index d2a80110cf..4cfedb5f1c 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -244,7 +244,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) expert_dlg_packet, expert_dlg_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(etd); return; @@ -257,7 +257,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) error_string=register_tap_listener("expert", ss, filter, error_reset, error_packet, NULL); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ss); return; diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index 603128ea61..205d3c6bce 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -546,7 +546,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) expert_dlg_packet, expert_dlg_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(etd); return; diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index 13aa17f5b2..b9502d6c57 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -181,7 +181,7 @@ gtk_fcstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("fc", fc, filter, fcstat_reset, fcstat_packet, fcstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(fc); return; diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index 53a0b7df68..c624a7749d 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -419,7 +419,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data) /* write the frame label */ - g_string_printf(tmp_str, empty_line->str); + g_string_append(tmp_str, empty_line->str); overwrite(tmp_str,user_data->dlg.items[current_item].frame_label, start_position, end_position @@ -432,7 +432,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data) /* write the arrow and frame label*/ fprintf(of, "%s", empty_header); - g_string_printf(tmp_str, empty_line->str); + g_string_append(tmp_str, empty_line->str); g_string_truncate(tmp_str2, 0); diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index 5b60df5907..b2f508fd1e 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -678,7 +678,7 @@ register_tap_listener_gtkgsm_a_stat(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_p->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_p->str); g_string_free(err_p, TRUE); exit(1); diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index 572710de3a..f4f15cfa22 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -472,7 +472,7 @@ register_tap_listener_gtkgsm_map_stat(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_p->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_p->str); g_string_free(err_p, TRUE); exit(1); diff --git a/gtk/gtp_stat.c b/gtk/gtp_stat.c index efb7f3a782..5dd635f5b3 100644 --- a/gtk/gtp_stat.c +++ b/gtk/gtp_stat.c @@ -198,7 +198,7 @@ gtk_gtpstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("gtp", gtp, filter, gtpstat_reset, gtpstat_packet, gtpstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(gtp); return; diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index ce9aceb2ad..3100ef97e5 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -534,7 +534,7 @@ gtk_h225counter_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("h225", hs, filter, h225counter_reset, h225counter_packet, h225counter_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(hs->filter); g_free(hs); diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index e1a1b3fb5f..712ae83a0b 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -314,7 +314,7 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("h225", hs, filter, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(hs->filter); g_free(hs); diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index a13904885e..bfb5046011 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -180,7 +180,7 @@ reset_hostlist_table_data(hostlist_table *hosts) } error_string = set_tap_dfilter (hosts, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; } @@ -686,7 +686,7 @@ init_hostlist_table_page(hostlist_table *hosttable, GtkWidget *vbox, gboolean hi /* register the tap and rerun the taps on the packet list */ error_string=register_tap_listener(tap_name, hosttable, filter, reset_hostlist_table_data_cb, packet_func, draw_hostlist_table_data_cb); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(hosttable); return FALSE; diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index 1a8cadfa25..a2eb6c2384 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -214,7 +214,7 @@ gtk_ldapstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("ldap", ldap, filter, ldapstat_reset, ldapstat_packet, ldapstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ldap); return; diff --git a/gtk/mcast_stream.c b/gtk/mcast_stream.c index e6d07b3f2f..db91af9265 100644 --- a/gtk/mcast_stream.c +++ b/gtk/mcast_stream.c @@ -345,7 +345,7 @@ register_tap_listener_mcast_stream(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 4b512c89c5..910ccd5e26 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -280,7 +280,7 @@ gtk_mgcpstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("mgcp", ms, filter, mgcpstat_reset, mgcpstat_packet, mgcpstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ms->filter); g_free(ms); diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 9ae5638b0b..5b2744aa9a 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -457,7 +457,7 @@ register_tap_listener_gtkmtp3_stat(void) if (err_p != NULL) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, err_p->str); + simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, "%s", err_p->str); g_string_free(err_p, TRUE); exit(1); diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c index 2be8fb88f2..838b205abb 100644 --- a/gtk/ncp_stat.c +++ b/gtk/ncp_stat.c @@ -700,7 +700,7 @@ gtk_ncpstat_init(const char *optarg, void *userdata _U_) /* 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); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ss); return; diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 3a751fd158..a7ff0311ed 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1787,7 +1787,7 @@ static void on_refresh_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) error_string = register_tap_listener("rtp", user_data, NULL, rtp_reset, rtp_packet, rtp_draw); if (error_string != NULL) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; } @@ -3350,7 +3350,7 @@ static void rtp_analysis_cb(GtkWidget *w _U_, gpointer data _U_) /* Try to compile the filter. */ g_strlcpy(filter_text,"rtp && rtp.version && rtp.ssrc && (ip || ipv6)",256); if (!dfilter_compile(filter_text, &sfcode)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg); return; } /* we load the current file into cf variable */ diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index 29770fb18e..ecc543853a 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -191,7 +191,7 @@ register_tap_listener_rtp_stream(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index e96e496837..73ecc52761 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -266,7 +266,7 @@ gtk_scsistat_init(const char *optarg, void* userdata _U_) error_string=register_tap_listener("scsi", rs, filter, scsistat_reset, scsistat_packet, scsistat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); free_srt_table_data(&rs->srt_table); g_free(rs); diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index dd2cfcb423..226e65513e 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -838,7 +838,7 @@ static void sctp_analyse_cb(struct sctp_analyse* u_data, gboolean ext) g_strlcpy(filter_text,"sctp",250); if (!dfilter_compile(filter_text, &sfcode)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg); return; } diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index e93e6e9590..b56a531743 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -315,7 +315,7 @@ sctpstat_init(const char *optarg, void *userdata _U_) sctpstat_packet, sctpstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(hs->filter); g_free(hs); diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 9661f1de7e..66af339db3 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -1260,7 +1260,7 @@ register_tap_listener_sctp_stat(void) if (!sctp_tapinfo_struct.is_registered) { if ((error_string = register_tap_listener("sctp", &sctp_tapinfo_struct, NULL, reset, packet, sctp_update))) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; } diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index 710db5b58b..056f09d2dc 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -630,7 +630,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_) if (error_string) { /* Error. We failed to attach to the tap. Clean up */ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_free(sp->filter); g_free(sp); g_string_free(error_string, TRUE); diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c index 069f5583cc..e590237807 100644 --- a/gtk/smb2_stat.c +++ b/gtk/smb2_stat.c @@ -178,7 +178,7 @@ gtk_smb2stat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("smb2", ss, filter, smb2stat_reset, smb2stat_packet, smb2stat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ss); return; diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 1f8ec8f382..5be5e2d57e 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -216,7 +216,7 @@ gtk_smbstat_init(const char *optarg, void *userdata _U_) error_string=register_tap_listener("smb", ss, filter, smbstat_reset, smbstat_packet, smbstat_draw); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); g_free(ss); return; diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index ac35800591..549433d0fb 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -307,7 +307,7 @@ init_gtk_tree(const char* optarg, void *userdata _U_) if (error_string) { /* error, we failed to attach to the tap. clean up */ - simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str ); + simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str ); /* destroy_stat_tree_window(st); */ report_failure("stats_tree for: %s failed to attach to the tap: %s",cfg->name,error_string->str); g_string_free(error_string, TRUE); diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index bbda34ddf8..e01ec6791e 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -1808,7 +1808,7 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment /* no real filter yet */ if (!dfilter_compile("tcp", &sfcode)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, dfilter_error_msg); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg); return NULL; } diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 72f253cdf1..05f34be6fe 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -153,7 +153,7 @@ static char* fld_tostr(void* rec, uat_field_t* f) { for (i=0; i<len;i++) g_string_append_printf(s,"%.2X",((guint8*)ptr)[i]); - out = ep_strdup_printf(s->str); + out = ep_strdup(s->str); g_string_free(s,TRUE); break; diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index ac7cf57fe2..8cc4248288 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -438,7 +438,7 @@ rtp_event_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -671,7 +671,7 @@ rtp_init_tap(void) ); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -835,7 +835,7 @@ t38_init_tap(void) ); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1042,7 +1042,7 @@ sip_calls_init_tap(void) ); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1268,7 +1268,7 @@ isup_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1333,7 +1333,7 @@ mtp3_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1351,7 +1351,7 @@ mtp3_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1679,7 +1679,7 @@ q931_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -1982,7 +1982,7 @@ h225_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2150,7 +2150,7 @@ h245dg_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2216,7 +2216,7 @@ sdp_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2586,7 +2586,7 @@ mgcp_calls_init_tap(void) ); if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2718,7 +2718,7 @@ actrace_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2867,7 +2867,7 @@ void h248_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -2885,7 +2885,7 @@ void h248_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -3050,7 +3050,7 @@ void sccp_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -3068,7 +3068,7 @@ void sccp_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -3580,7 +3580,7 @@ unistim_calls_init_tap(void){ if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -3689,7 +3689,7 @@ VoIPcalls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } @@ -3752,7 +3752,7 @@ prot_calls_init_tap(void) if (error_string != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, - error_string->str); + "%s", error_string->str); g_string_free(error_string, TRUE); exit(1); } diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index c710fb48a6..db6cfb9d5c 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -177,7 +177,7 @@ wlanstat_reset (void *phs) error_string = set_tap_dfilter (wlan_stat, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free(error_string, TRUE); return; } @@ -1259,7 +1259,7 @@ wlanstat_dlg_create (void) error_string=register_tap_listener ("wlan", hs, NULL, wlanstat_reset, wlanstat_packet, wlanstat_draw); if (error_string) { - simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); g_string_free (error_string, TRUE); g_free (hs); return; diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 182fdefb6e..837101ccec 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -390,7 +390,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_) wspstat_draw); if (error_string){ /* error, we failed to attach to the tap. clean up */ - simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str ); + simple_dialog( ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str ); g_free(sp->pdu_stats); g_free(sp->filter); g_free(sp); |