replaced sprintf / snprintf by g_snprintf,

various other string related changes

svn path=/trunk/; revision=10373

29 files changed, 235 insertions, 258 deletions

diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 59fed4e218..a849d4ff93 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.c
@@ -5,7 +5,7 @@
  *
  * MUCH code modified from service_response_time_table.c.
  *
- * $Id: ansi_a_stat.c,v 1.15 2004/02/23 19:19:35 ulfl Exp $
+ * $Id: ansi_a_stat.c,v 1.16 2004/03/13 15:15:22 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -128,7 +128,7 @@ ansi_a_stat_draw(
     void		*tapdata)
 {
     int			i, j;
-    char		str[256], *strp;
+    char		*strp;
 
 
     tapdata = tapdata;
@@ -141,9 +141,8 @@ ansi_a_stat_draw(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg_bsmap.table), (gpointer) i);
 
-	    sprintf(str, "%d",
-		stat.bsmap_message_type[ansi_a_ios401_bsmap_strings[i].value]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d",
+		    stat.bsmap_message_type[ansi_a_ios401_bsmap_strings[i].value]);
 	    gtk_clist_set_text(GTK_CLIST(dlg_bsmap.table), j, 2, strp);
 	    g_free(strp);
 
@@ -161,9 +160,8 @@ ansi_a_stat_draw(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg_dtap.table), (gpointer) i);
 
-	    sprintf(str, "%d",
-		stat.dtap_message_type[ansi_a_ios401_dtap_strings[i].value]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d",
+		    stat.dtap_message_type[ansi_a_ios401_dtap_strings[i].value]);
 	    gtk_clist_set_text(GTK_CLIST(dlg_dtap.table), j, 2, strp);
 	    g_free(strp);
 
@@ -454,7 +452,7 @@ ansi_a_stat_gtk_bsmap_cb(
     i = 0;
     while (ansi_a_ios401_bsmap_strings[i].strptr)
     {
-	sprintf(str, "0x%02x", ansi_a_ios401_bsmap_strings[i].value);
+	g_snprintf(str, 100, "0x%02x", ansi_a_ios401_bsmap_strings[i].value);
 	dlg_bsmap.entries[0] = g_strdup(str);
 
 	dlg_bsmap.entries[1] = g_strdup(ansi_a_ios401_bsmap_strings[i].strptr);
@@ -494,7 +492,7 @@ ansi_a_stat_gtk_dtap_cb(
     i = 0;
     while (ansi_a_ios401_dtap_strings[i].strptr)
     {
-	sprintf(str, "0x%02x", ansi_a_ios401_dtap_strings[i].value);
+	g_snprintf(str, 100, "0x%02x", ansi_a_ios401_dtap_strings[i].value);
 	dlg_dtap.entries[0] = g_strdup(str);
 
 	dlg_dtap.entries[1] = g_strdup(ansi_a_ios401_dtap_strings[i].strptr);
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index 3a276cfee4..bdf8ca3254 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.c
@@ -5,7 +5,7 @@
  *
  * MUCH code modified from service_response_time_table.c.
  *
- * $Id: ansi_map_stat.c,v 1.18 2004/02/23 19:19:35 ulfl Exp $
+ * $Id: ansi_map_stat.c,v 1.19 2004/03/13 15:15:22 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -121,7 +121,7 @@ ansi_map_stat_draw(
     void		*tapdata)
 {
     int			i, j;
-    char		str[256], *strp;
+    char		*strp;
 
 
     tapdata = tapdata;
@@ -134,9 +134,8 @@ ansi_map_stat_draw(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg.table), (gpointer) i);
 
-	    sprintf(str, "%d",
-		stat.message_type[ansi_map_opr_code_strings[i].value]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d",
+		    stat.message_type[ansi_map_opr_code_strings[i].value]);
 	    gtk_clist_set_text(GTK_CLIST(dlg.table), j, 2, strp);
 	    g_free(strp);
 
@@ -427,7 +426,7 @@ ansi_map_stat_gtk_cb(
     i = 0;
     while (ansi_map_opr_code_strings[i].strptr)
     {
-	sprintf(str, "0x%02x", ansi_map_opr_code_strings[i].value);
+	g_snprintf(str, 100, "0x%02x", ansi_map_opr_code_strings[i].value);
 	dlg.entries[0] = g_strdup(str);
 
 	dlg.entries[1] = g_strdup(ansi_map_opr_code_strings[i].strptr);
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 2ae88c996f..7d0d8bdf37 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -1,7 +1,7 @@
 /* bootp_stat.c
  * boop_stat   2003 Jean-Michel FAYARD
  *
- * $Id: bootp_stat.c,v 1.23 2004/03/13 14:07:12 ulfl Exp $
+ * $Id: bootp_stat.c,v 1.24 2004/03/13 15:15:22 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -78,8 +78,10 @@ dhcp_reset_hash(gchar *key _U_ , dhcp_message_type_t *data, gpointer ptr _U_ )
  * or create it if it don't exist.
  */
 static void
-dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * string_buff )
+dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * unused _U_ )
 {
+	char string_buff[256];
+
 	if ((data==NULL) || (data->packets==0))
 		return;
 	if (data->widget==NULL){	/* create an entry in the table */
@@ -89,13 +91,13 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * string
 
 
 		/* Maybe we should display the hexadecimal value ? */
-		/* sprintf(string_buff, "%s  (0X%x)", data->name, *key); */
+		/* g_snprintf(string_buff, 256, "%s  (0X%x)", data->name, *key); */
 		tmp = gtk_label_new( data->name  /* string_buff */ );
 		gtk_table_attach_defaults(GTK_TABLE(data->sp->table_message_type), tmp, x, x+1, y, y+1);
 		gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
 		gtk_widget_show(tmp);
 
-		sprintf( string_buff, "%9d", data->packets );
+		g_snprintf( string_buff, 256, "%9d", data->packets );
 		data->widget = gtk_label_new( string_buff );
 		gtk_table_attach_defaults(GTK_TABLE(data->sp->table_message_type), data->widget, x+1, x+2, y, y+1);
 		gtk_label_set_justify(GTK_LABEL(data->widget), GTK_JUSTIFY_LEFT);
@@ -104,7 +106,7 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * string
 		data->sp->index++;
 	} else {
 		/* Just update the label string */
-		sprintf( string_buff, "%9d", data->packets );
+		g_snprintf( string_buff, 256, "%9d", data->packets );
 		gtk_label_set( GTK_LABEL(data->widget), string_buff);
 	}
 }
@@ -149,11 +151,10 @@ static void
 dhcpstat_draw(void *psp)
 {
 	dhcpstat_t *sp=psp;
-	char str[256];
 	guint index;
 
 	index=sp->index;
-	g_hash_table_foreach( sp->hash, (GHFunc) dhcp_draw_message_type, str );
+	g_hash_table_foreach( sp->hash, (GHFunc) dhcp_draw_message_type, NULL );
 	if (index != sp->index){
 		/* We have inserted a new entry corresponding to a status code ,
 		 * let's resize the table */
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 2ca95cdf80..76a37cdad7 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -1,7 +1,7 @@
 /* capture_info_dlg.c
  * Routines for packet capture info dialog
  *
- * $Id: capture_info_dlg.c,v 1.12 2004/02/21 12:58:42 ulfl Exp $
+ * $Id: capture_info_dlg.c,v 1.13 2004/03/13 15:15:22 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -236,7 +236,7 @@ capture_info    *cinfo)
 
 
   /* calculate and display running time */
-  snprintf(label_str, sizeof(label_str), "%02ld:%02ld:%02ld", 
+  g_snprintf(label_str, sizeof(label_str), "%02ld:%02ld:%02ld", 
            (long)(cinfo->running_time/3600), (long)((cinfo->running_time%3600)/60),
            (long)(cinfo->running_time%60));
   gtk_label_set(GTK_LABEL(info->running_time_lb), label_str);
@@ -244,7 +244,7 @@ capture_info    *cinfo)
   if (cinfo->new_packets) {
 
     for (i = 0; i < CAPTURE_PACKET_COUNTS; i++) {
-        snprintf(label_str, sizeof(label_str), "%d",
+        g_snprintf(label_str, sizeof(label_str), "%d",
                  *info->counts[i].value_ptr);
         gtk_label_set(GTK_LABEL(info->counts[i].value_lb), label_str);
 
diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index 66d4a1455b..3ee985b1e3 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -1,7 +1,7 @@
 /* capture_prefs.c
  * Dialog box for capture preferences
  *
- * $Id: capture_prefs.c,v 1.30 2004/02/13 00:53:34 guy Exp $
+ * $Id: capture_prefs.c,v 1.31 2004/03/13 15:15:22 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -743,10 +743,10 @@ ifopts_write_new_descr(void)
 		if ((strlen(ifnm) + strlen(desc) + 4 + 
 				strlen(new_descr)) <  MAX_VAL_LEN) {
 			if (first_if == 1)
-				snprintf(tmp_descr, IFOPTS_MAX_DESCR_LEN+MAX_WIN_IF_NAME_LEN+4,
+				g_snprintf(tmp_descr, IFOPTS_MAX_DESCR_LEN+MAX_WIN_IF_NAME_LEN+4,
 						"%s(%s)", ifnm, desc);
 			else
-				snprintf(tmp_descr, IFOPTS_MAX_DESCR_LEN+MAX_WIN_IF_NAME_LEN+4,
+				g_snprintf(tmp_descr, IFOPTS_MAX_DESCR_LEN+MAX_WIN_IF_NAME_LEN+4,
 						",%s(%s)", ifnm, desc);
 			strcat(new_descr, tmp_descr);
 			/* set first-in-list flag to false */
@@ -830,9 +830,9 @@ ifopts_write_new_hide(void)
 		 */
 		if ((strlen(ifnm) + 2 + strlen(new_hide)) <  MAX_VAL_LEN) {
 			if (first_if == 1)
-				snprintf(tmp_hide, MAX_WIN_IF_NAME_LEN+2, "%s", ifnm);
+				g_snprintf(tmp_hide, MAX_WIN_IF_NAME_LEN+2, "%s", ifnm);
 			else
-				snprintf(tmp_hide, MAX_WIN_IF_NAME_LEN+2, ",%s", ifnm);
+				g_snprintf(tmp_hide, MAX_WIN_IF_NAME_LEN+2, ",%s", ifnm);
 			strcat(new_hide, tmp_hide);
 			/* set first-in-list flag to false */
 			first_if = 0;
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index bcd2e32ef0..82db82c193 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -1,7 +1,7 @@
 /* color_dlg.c
  * Definitions for dialog boxes for color filters
  *
- * $Id: color_dlg.c,v 1.43 2004/03/13 11:43:21 ulfl Exp $
+ * $Id: color_dlg.c,v 1.44 2004/03/13 15:15:23 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -508,9 +508,9 @@ add_filter_to_list(gpointer filter_arg, gpointer list_arg)
 
   store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list_arg)));
   gtk_list_store_append(store, &iter);
-  sprintf(fg_str, "#%04X%04X%04X",
+  g_snprintf(fg_str, 14, "#%04X%04X%04X",
           colorf->fg_color.red, colorf->fg_color.green, colorf->fg_color.blue);
-  sprintf(bg_str, "#%04X%04X%04X",
+  g_snprintf(bg_str, 14, "#%04X%04X%04X",
           colorf->bg_color.red, colorf->bg_color.green, colorf->bg_color.blue);
   gtk_list_store_set(store, &iter, 0, colorf->filter_name,
                      1, colorf->filter_text, 2, fg_str, 3, bg_str,
@@ -1483,9 +1483,9 @@ edit_color_filter_ok_cb                (GtkButton       *button,
         gtk_clist_set_background(GTK_CLIST(color_filters), row_selected,
                                  &new_bg_color);
 #else
-        sprintf(fg_str, "#%04X%04X%04X",
+        g_snprintf(fg_str, 14, "#%04X%04X%04X",
                 new_fg_color.red, new_fg_color.green, new_fg_color.blue);
-        sprintf(bg_str, "#%04X%04X%04X",
+        g_snprintf(bg_str, 14, "#%04X%04X%04X",
                 new_bg_color.red, new_bg_color.green, new_bg_color.blue);
         model = gtk_tree_view_get_model(GTK_TREE_VIEW(color_filters));
         gtk_tree_model_iter_nth_child(model, &iter, NULL, row_selected);
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 893283bff8..492c5cfb44 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -1,7 +1,7 @@
 /* dcerpc_stat.c
  * dcerpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: dcerpc_stat.c,v 1.52 2004/02/27 19:07:18 ulfl Exp $
+ * $Id: dcerpc_stat.c,v 1.53 2004/03/13 15:15:23 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -275,7 +275,7 @@ gtk_dcerpcstat_init(char *optarg)
 	gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
 	gtk_widget_show(stat_label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
 	filter_label=gtk_label_new(filter_string);
 	gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
 	gtk_widget_show(filter_label);
@@ -388,7 +388,7 @@ dcerpcstat_find_vers(gpointer *key, gpointer *value _U_, gpointer *user_data _U_
 		return NULL;
 	}
 
-	sprintf(vs,"%u",k->ver);
+	g_snprintf(vs, 5, "%u",k->ver);
 	menu_item=gtk_menu_item_new_with_label(vs);
 	SIGNAL_CONNECT(menu_item, "activate", dcerpcstat_version_select,
                        ((int)k->ver));
@@ -435,7 +435,7 @@ dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
 	case 0:
 
 		first_menu_name=v->name;
-		snprintf(str,63,"%s ...",v->name);
+		g_snprintf(str,63,"%s ...",v->name);
 		program_submenu_item=gtk_menu_item_new();
 		box=gtk_hbox_new(TRUE,0);
 		gtk_container_add(GTK_CONTAINER(program_submenu_item), box);
@@ -452,7 +452,7 @@ dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(program_submenu_item), program_submenu_menu);
 		break;
 	case 14:
-		snprintf(str,63,"%s - %s",first_menu_name,v->name);
+		g_snprintf(str,63,"%s - %s",first_menu_name,v->name);
 		gtk_label_set_text(GTK_LABEL(program_submenu_label), str);
 		break;
 /*qqq*/
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 616f42d815..82a8677abd 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
 /* decode_as_dlg.c
  *
- * $Id: decode_as_dlg.c,v 1.38 2004/03/13 14:07:12 ulfl Exp $
+ * $Id: decode_as_dlg.c,v 1.39 2004/03/13 15:15:23 ulfl Exp $
  *
  * Routines to modify dissector tables on the fly.
  *
@@ -290,26 +290,26 @@ decode_build_show_list (gchar *table_name, ftenum_t selector_type,
 	switch (get_dissector_table_base(table_name)) {
 
 	case BASE_DEC:
-	    sprintf(string1, "%u", GPOINTER_TO_UINT(key));
+	    g_snprintf(string1, sizeof(string1), "%u", GPOINTER_TO_UINT(key));
 	    break;
 
 	case BASE_HEX:
 	    switch (get_dissector_table_selector_type(table_name)) {
 
 	    case FT_UINT8:
-		sprintf(string1, "0x%02x", GPOINTER_TO_UINT(key));
+		g_snprintf(string1, sizeof(string1), "0x%02x", GPOINTER_TO_UINT(key));
 		break;
 
 	    case FT_UINT16:
-		sprintf(string1, "0x%04x", GPOINTER_TO_UINT(key));
+		g_snprintf(string1, sizeof(string1), "0x%04x", GPOINTER_TO_UINT(key));
 		break;
 
 	    case FT_UINT24:
-		sprintf(string1, "0x%06x", GPOINTER_TO_UINT(key));
+		g_snprintf(string1, sizeof(string1), "0x%06x", GPOINTER_TO_UINT(key));
 		break;
 
 	    case FT_UINT32:
-		sprintf(string1, "0x%08x", GPOINTER_TO_UINT(key));
+		g_snprintf(string1, sizeof(string1), "0x%08x", GPOINTER_TO_UINT(key));
 		break;
 
 	    default:
@@ -319,7 +319,7 @@ decode_build_show_list (gchar *table_name, ftenum_t selector_type,
 	    break;
 
 	case BASE_OCT:
-	    sprintf(string1, "%#o", GPOINTER_TO_UINT(key));
+	    g_snprintf(string1, sizeof(string1), "%#o", GPOINTER_TO_UINT(key));
 	    break;
 	}
 	text[E_LIST_D_SELECTOR] = string1;
@@ -990,13 +990,13 @@ decode_add_srcdst_menu (GtkWidget *page)
 
     optmenu = gtk_option_menu_new();
     menu = gtk_menu_new();
-    sprintf(tmp, "source (%u)", cfile.edt->pi.srcport);
+    g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     OBJECT_SET_DATA(menuitem, "user_data", GINT_TO_POINTER(E_DECODE_SPORT));
     gtk_menu_append(GTK_MENU(menu), menuitem);
     gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
 
-    sprintf(tmp, "destination (%u)", cfile.edt->pi.destport);
+    g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     OBJECT_SET_DATA(menuitem, "user_data", GINT_TO_POINTER(E_DECODE_DPORT));
     gtk_menu_append(GTK_MENU(menu), menuitem);
@@ -1394,7 +1394,7 @@ decode_add_notebook (GtkWidget *format_hb)
 
     /* Add link level selection page */
     if (cfile.edt->pi.ethertype) {
-	sprintf(buffer, "Ethertype 0x%04x", cfile.edt->pi.ethertype);
+	g_snprintf(buffer, 40, "Ethertype 0x%04x", cfile.edt->pi.ethertype);
 	page = decode_add_simple_page(buffer, "Link", "ethertype", cfile.edt->pi.ethertype);
 	label = gtk_label_new("Link");
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, label);
@@ -1405,7 +1405,7 @@ decode_add_notebook (GtkWidget *format_hb)
 	/*
 	 * The network-layer protocol is IP.
 	 */
-	sprintf(buffer, "IP protocol %u", cfile.edt->pi.ipproto);
+	g_snprintf(buffer, 40, "IP protocol %u", cfile.edt->pi.ipproto);
 	page = decode_add_simple_page(buffer, "Network", "ip.proto", cfile.edt->pi.ipproto);
 	OBJECT_SET_DATA(page, E_PAGE_ACTION, decode_simple);
 	label = gtk_label_new("Network");
diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c
index 0ecf66e747..4b4de30259 100644
--- a/gtk/endpoint_talkers_table.c
+++ b/gtk/endpoint_talkers_table.c
@@ -4,7 +4,7 @@
  * endpoint_talkers_table   2003 Ronnie Sahlberg
  * Helper routines common to all endpoint talkers tap.
  *
- * $Id: endpoint_talkers_table.c,v 1.32 2004/02/23 22:48:51 guy Exp $
+ * $Id: endpoint_talkers_table.c,v 1.33 2004/03/13 15:15:23 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -76,7 +76,7 @@ ett_port_to_str(int port_type, guint32 port)
 	switch(port_type){
 	case PT_TCP:
 	case PT_UDP:
-		snprintf(strp, 11, "%d", port);
+		g_snprintf(strp, 11, "%d", port);
 		return strp;
 	}
 	return NULL;
@@ -212,7 +212,7 @@ reset_ett_table_data(endpoints_table *et)
 	guint32 i;
 	char title[256];
 
-	snprintf(title, 255, "%s Conversations: %s", et->name, cf_get_display_name(&cfile));
+	g_snprintf(title, 255, "%s Conversations: %s", et->name, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(et->win), title);
 
 	/* remove all entries from the clist */
@@ -372,7 +372,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 	switch(direction){
 	case 0:
 		/* EP1 <-> EP2 */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -389,7 +389,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 1:
 		/* EP1 --> EP2 */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -406,7 +406,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 2:
 		/* EP1 <-- EP2 */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s && %s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -423,7 +423,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 3:
 		/* EP1 <-> ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -434,7 +434,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 4:
 		/* EP1 --> ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -445,7 +445,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 5:
 		/* EP1 <-- ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].src_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&et->endpoints[selection].src_address),
 			sport?" && ":"",
@@ -456,7 +456,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 6:
 		/* EP2 <-> ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].dst_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_ANY_ADDRESS),
 			address_to_str(&et->endpoints[selection].dst_address),
 			dport?" && ":"",
@@ -467,7 +467,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 7:
 		/* EP2 --> ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].dst_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_SRC_ADDRESS),
 			address_to_str(&et->endpoints[selection].dst_address),
 			dport?" && ":"",
@@ -478,7 +478,7 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 		break;
 	case 8:
 		/* EP2 <-- ANY */
-		snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+		g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 			ett_get_filter_name(&et->endpoints[selection].dst_address, et->endpoints[selection].sat, et->endpoints[selection].port_type,  FN_DST_ADDRESS),
 			address_to_str(&et->endpoints[selection].dst_address),
 			dport?" && ":"",
@@ -493,27 +493,27 @@ ett_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 	switch(type){
 	case 0:
 		/* selected */
-		snprintf(str, 255, "%s", dirstr);
+		g_snprintf(str, 255, "%s", dirstr);
 		break;
 	case 1:
 		/* not selected */
-		snprintf(str, 255, "!(%s)", dirstr);
+		g_snprintf(str, 255, "!(%s)", dirstr);
 		break;
 	case 2:
 		/* and selected */
-		snprintf(str, 255, "(%s) && (%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) && (%s)", current_filter, dirstr);
 		break;
 	case 3:
 		/* or selected */
-		snprintf(str, 255, "(%s) || (%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) || (%s)", current_filter, dirstr);
 		break;
 	case 4:
 		/* and not selected */
-		snprintf(str, 255, "(%s) && !(%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) && !(%s)", current_filter, dirstr);
 		break;
 	case 5:
 		/* or not selected */
-		snprintf(str, 255, "(%s) || !(%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) || !(%s)", current_filter, dirstr);
 		break;
 	}
 
@@ -918,21 +918,21 @@ draw_ett_table_data(endpoints_table *et)
 
 		j=gtk_clist_find_row_from_data(et->table, (gpointer)i);
 
-		sprintf(str, "%u", et->endpoints[i].tx_frames+et->endpoints[i].rx_frames);
+		g_snprintf(str, 16, "%u", et->endpoints[i].tx_frames+et->endpoints[i].rx_frames);
 		gtk_clist_set_text(et->table, j, 4, str);		
-		sprintf(str, "%u", et->endpoints[i].tx_bytes+et->endpoints[i].rx_bytes);
+		g_snprintf(str, 16, "%u", et->endpoints[i].tx_bytes+et->endpoints[i].rx_bytes);
 		gtk_clist_set_text(et->table, j, 5, str);		
 
 
-		sprintf(str, "%u", et->endpoints[i].tx_frames);
+		g_snprintf(str, 16, "%u", et->endpoints[i].tx_frames);
 		gtk_clist_set_text(et->table, j, 6, str);	
-		sprintf(str, "%u", et->endpoints[i].tx_bytes);
+		g_snprintf(str, 16, "%u", et->endpoints[i].tx_bytes);
 		gtk_clist_set_text(et->table, j, 7, str);		
 
 
-		sprintf(str, "%u", et->endpoints[i].rx_frames);
+		g_snprintf(str, 16, "%u", et->endpoints[i].rx_frames);
 		gtk_clist_set_text(et->table, j, 8, str);		
-		sprintf(str, "%u", et->endpoints[i].rx_bytes);
+		g_snprintf(str, 16, "%u", et->endpoints[i].rx_bytes);
 		gtk_clist_set_text(et->table, j, 9, str);		
 
 	}
@@ -960,7 +960,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
 	talkers=g_malloc(sizeof(endpoints_table));
 
 	talkers->name=table_name;
-	snprintf(title, 255, "%s Conversations: %s", table_name, cf_get_display_name(&cfile));
+	g_snprintf(title, 255, "%s Conversations: %s", table_name, cf_get_display_name(&cfile));
 	talkers->win=window_new(GTK_WINDOW_TOPLEVEL, title);
 	gtk_window_set_default_size(GTK_WINDOW(talkers->win), 750, 400);
 
@@ -971,7 +971,7 @@ init_ett_table(gboolean hide_ports, char *table_name, char *tap_name, char *filt
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
 	gtk_widget_show(vbox);
 
-	snprintf(title, 255, "%s Conversations", table_name);
+	g_snprintf(title, 255, "%s Conversations", table_name);
 	label=gtk_label_new(title);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
@@ -1182,19 +1182,19 @@ add_ett_table_data(endpoints_table *et, address *src, address *dst, guint32 src_
 		entries[2]=address_to_str(&talker->dst_address);
 		entries[3]=dport?dport:"";
 
-		sprintf(frames,"%u", talker->tx_frames+talker->rx_frames);
+		g_snprintf(frames, 16, "%u", talker->tx_frames+talker->rx_frames);
 		entries[4]=frames;
-		sprintf(bytes,"%u", talker->tx_bytes+talker->rx_bytes);
+		g_snprintf(bytes, 16, "%u", talker->tx_bytes+talker->rx_bytes);
 		entries[5]=bytes;
 
-		sprintf(txframes,"%u", talker->tx_frames);
+		g_snprintf(txframes, 16, "%u", talker->tx_frames);
 		entries[6]=txframes;
-		sprintf(txbytes,"%u", talker->tx_bytes);
+		g_snprintf(txbytes, 16, "%u", talker->tx_bytes);
 		entries[7]=txbytes;
 
-		sprintf(rxframes,"%u", talker->rx_frames);
+		g_snprintf(rxframes, 16, "%u", talker->rx_frames);
 		entries[8]=rxframes;
-		sprintf(rxbytes,"%u", talker->rx_bytes);
+		g_snprintf(rxbytes, 16, "%u", talker->rx_bytes);
 		entries[9]=rxbytes;
 
 		gtk_clist_insert(et->table, talker_idx, entries);
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 3c5b001e4f..89a6726776 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -1,7 +1,7 @@
 /* fc_stat.c
  * fc_stat   2003 Ronnie Sahlberg
  *
- * $Id: fc_stat.c,v 1.29 2004/02/27 19:07:18 ulfl Exp $
+ * $Id: fc_stat.c,v 1.30 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -160,7 +160,7 @@ gtk_fcstat_init(char *optarg)
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	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);
 	gtk_widget_show(label);
diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c
index ef47ea333f..5257fe80e5 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -1,6 +1,6 @@
 /* follow_dlg.c
  *
- * $Id: follow_dlg.c,v 1.52 2004/03/13 14:07:13 ulfl Exp $
+ * $Id: follow_dlg.c,v 1.53 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -38,10 +38,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include <ctype.h>
 
 #include "color.h"
@@ -343,7 +339,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 	stream_menu = gtk_menu_new();
 
 	/* Both Hosts */
-	snprintf(string, sizeof(string),
+	g_snprintf(string, sizeof(string),
 		 "Entire conversation (%u bytes)",
 		 stats.bytes_written[0] + stats.bytes_written[1]);
 	stream_mi = gtk_menu_item_new_with_label(string);
@@ -354,7 +350,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 	follow_info->show_stream = BOTH_HOSTS;
 
 	/* Host 0 --> Host 1 */
-	snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
+	g_snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
 		 hostname0, port0, hostname1, port1,
 		 stats.bytes_written[0]);
 	stream_mi = gtk_menu_item_new_with_label(string);
@@ -364,7 +360,7 @@ follow_stream_cb(GtkWidget * w, gpointer data _U_)
 	gtk_widget_show(stream_mi);
 
 	/* Host 1 --> Host 0 */
-	snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
+	g_snprintf(string, sizeof(string), "%s:%s --> %s:%s (%u bytes)",
 		 hostname1, port1, hostname0, port0,
 		 stats.bytes_written[1]);
 	stream_mi = gtk_menu_item_new_with_label(string);
@@ -668,7 +664,7 @@ follow_read_stream(follow_info_t *follow_info,
 
 		case SHOW_CARRAY:
 		    current_pos = 0;
-		    sprintf(initbuf, "char peer%d_%d[] = {\n", is_server ? 1 : 0,
+		    g_snprintf(initbuf, 256, "char peer%d_%d[] = {\n", is_server ? 1 : 0,
 			    is_server ? server_packet_count++ : client_packet_count++);
 		    if (!(*print_line) (initbuf, strlen(initbuf), is_server, arg))
 			goto print_error;
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index dbd6a88536..ed9fafba0b 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -5,7 +5,7 @@
  *
  * MUCH code modified from service_response_time_table.c.
  *
- * $Id: gsm_a_stat.c,v 1.15 2004/02/23 19:19:36 ulfl Exp $
+ * $Id: gsm_a_stat.c,v 1.16 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -170,7 +170,7 @@ gsm_a_stat_draw_aux(
     const value_string	*msg_strings)
 {
     int			i, j;
-    char		str[256], *strp;
+    char		*strp;
 
 
     if (dlg_p->win != NULL)
@@ -181,8 +181,7 @@ gsm_a_stat_draw_aux(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg_p->table), (gpointer) i);
 
-	    sprintf(str, "%d", message_count[msg_strings[i].value]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d", message_count[msg_strings[i].value]);
 	    gtk_clist_set_text(GTK_CLIST(dlg_p->table), j, 2, strp);
 	    g_free(strp);
 
@@ -537,7 +536,7 @@ gsm_a_stat_gtk_bssmap_cb(
     i = 0;
     while (gsm_a_bssmap_msg_strings[i].strptr)
     {
-	sprintf(str, "0x%02x", gsm_a_bssmap_msg_strings[i].value);
+	g_snprintf(str, 100, "0x%02x", gsm_a_bssmap_msg_strings[i].value);
 	dlg_bssmap.entries[0] = g_strdup(str);
 
 	dlg_bssmap.entries[1] = g_strdup(gsm_a_bssmap_msg_strings[i].strptr);
@@ -580,7 +579,7 @@ gsm_a_stat_gtk_dtap_cb(
     i = 0;
     while (dtap_msg_strings[i].strptr)
     {
-	sprintf(str, "0x%02x", dtap_msg_strings[i].value);
+	g_snprintf(str, 100, "0x%02x", dtap_msg_strings[i].value);
 	dlg_dtap_p->entries[0] = g_strdup(str);
 
 	dlg_dtap_p->entries[1] = g_strdup(dtap_msg_strings[i].strptr);
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index c0c43aeaab..6a55f87644 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.c
@@ -5,7 +5,7 @@
  *
  * MUCH code modified from service_response_time_table.c.
  *
- * $Id: gsm_map_stat.c,v 1.4 2004/02/23 19:19:36 ulfl Exp $
+ * $Id: gsm_map_stat.c,v 1.5 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -119,7 +119,7 @@ gsm_map_stat_draw(
     void		*tapdata)
 {
     int			i, j;
-    char		str[256], *strp;
+    char		*strp;
 
 
     tapdata = tapdata;
@@ -132,8 +132,7 @@ gsm_map_stat_draw(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg.table), (gpointer) i);
 
-	    sprintf(str, "%d", stat.opr_code[i]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d", stat.opr_code[i]);
 	    gtk_clist_set_text(GTK_CLIST(dlg.table), j, 2, strp);
 	    g_free(strp);
 
@@ -438,7 +437,7 @@ gsm_map_stat_gtk_cb(
     i = 0;
     while (gsm_map_opr_code_strings[i].strptr)
     {
-	sprintf(str, "%u", gsm_map_opr_code_strings[i].value);
+	g_snprintf(str, 100, "%u", gsm_map_opr_code_strings[i].value);
 	dlg.entries[0] = g_strdup(str);
 
 	dlg.entries[1] = g_strdup(gsm_map_opr_code_strings[i].strptr);
diff --git a/gtk/gtk_stat_util.c b/gtk/gtk_stat_util.c
index 828ed28722..9706a268e7 100644
--- a/gtk/gtk_stat_util.c
+++ b/gtk/gtk_stat_util.c
@@ -2,7 +2,7 @@
  * gui functions used by stats
  * Copyright 2003 Lars Roland
  *
- * $Id: gtk_stat_util.c,v 1.4 2004/02/06 19:19:10 ulfl Exp $
+ * $Id: gtk_stat_util.c,v 1.5 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -83,7 +83,7 @@ init_main_stat_window(GtkWidget *window, GtkWidget *mainbox, char *title, char *
 	gtk_box_pack_start(GTK_BOX(mainbox), main_label, FALSE, FALSE, 0);
 	gtk_widget_show(main_label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
 	filter_label=gtk_label_new(filter_string);
 	gtk_box_pack_start(GTK_BOX(mainbox), filter_label, FALSE, FALSE, 0);
 	gtk_widget_show(filter_label);
diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c
index 0be3ab67c8..422f7686f0 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.c
@@ -1,7 +1,7 @@
 /* gui_prefs.c
  * Dialog box for GUI preferences
  *
- * $Id: gui_prefs.c,v 1.65 2004/02/24 18:39:13 ulfl Exp $
+ * $Id: gui_prefs.c,v 1.66 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -268,7 +268,7 @@ gui_prefs_show(void)
 	/* Number of entries in the recent_files list ... */
 	recent_files_count_max_te = create_preference_entry(main_tb, pos++,
 	    "\"Open Recent\" max. list entries:", "Maximum number of recent files", recent_files_count_max_str);
-	sprintf(current_val_str, "%d", prefs.gui_recent_files_count_max);
+	g_snprintf(current_val_str, 128, "%d", prefs.gui_recent_files_count_max);
 	gtk_entry_set_text(GTK_ENTRY(recent_files_count_max_te), current_val_str);
 	OBJECT_SET_DATA(main_vb, GUI_RECENT_FILES_COUNT_KEY, recent_files_count_max_te);
 	SIGNAL_CONNECT(recent_files_count_max_te, "focus_out_event", recent_files_count_changed_cb, main_vb);
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 6f9b61698f..f3126e84ff 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -2,7 +2,7 @@
  * modified from endpoint_talkers_table.c   2003 Ronnie Sahlberg
  * Helper routines common to all host list taps.
  *
- * $Id: hostlist_table.c,v 1.4 2004/02/23 22:48:51 guy Exp $
+ * $Id: hostlist_table.c,v 1.5 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -72,7 +72,7 @@ hostlist_port_to_str(int port_type, guint32 port)
 	switch(port_type){
 	case PT_TCP:
 	case PT_UDP:
-		snprintf(strp, 11, "%d", port);
+		g_snprintf(strp, 11, "%d", port);
 		return strp;
 	}
 	return NULL;
@@ -144,7 +144,7 @@ reset_hostlist_table_data(hostlist_table *hosts)
 	guint32 i;
 	char title[256];
 
-	snprintf(title, 255, "%s: %s", hosts->name, cf_get_display_name(&cfile));
+	g_snprintf(title, 255, "%s: %s", hosts->name, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(hosts->win), title);
 
 	/* remove all entries from the clist */
@@ -283,7 +283,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
 
 	sport=hostlist_port_to_str(hl->hosts[selection].port_type, hl->hosts[selection].src_port);
 
-	snprintf(dirstr, 127, "%s==%s %s%s%s%s",
+	g_snprintf(dirstr, 127, "%s==%s %s%s%s%s",
 		hostlist_get_filter_name(&hl->hosts[selection].src_address, 
 		hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_ADDRESS),
 		address_to_str(&hl->hosts[selection].src_address),
@@ -296,27 +296,27 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
 	switch(type){
 	case 0:
 		/* selected */
-		snprintf(str, 255, "%s", dirstr);
+		g_snprintf(str, 255, "%s", dirstr);
 		break;
 	case 1:
 		/* not selected */
-		snprintf(str, 255, "!(%s)", dirstr);
+		g_snprintf(str, 255, "!(%s)", dirstr);
 		break;
 	case 2:
 		/* and selected */
-		snprintf(str, 255, "(%s) && (%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) && (%s)", current_filter, dirstr);
 		break;
 	case 3:
 		/* or selected */
-		snprintf(str, 255, "(%s) || (%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) || (%s)", current_filter, dirstr);
 		break;
 	case 4:
 		/* and not selected */
-		snprintf(str, 255, "(%s) && !(%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) && !(%s)", current_filter, dirstr);
 		break;
 	case 5:
 		/* or not selected */
-		snprintf(str, 255, "(%s) || !(%s)", current_filter, dirstr);
+		g_snprintf(str, 255, "(%s) || !(%s)", current_filter, dirstr);
 		break;
 	}
 
@@ -435,21 +435,21 @@ draw_hostlist_table_data(hostlist_table *hl)
 
 		j=gtk_clist_find_row_from_data(hl->table, (gpointer)i);
 
-		sprintf(str, "%u", hl->hosts[i].tx_frames+hl->hosts[i].rx_frames);
+		g_snprintf(str, 16, "%u", hl->hosts[i].tx_frames+hl->hosts[i].rx_frames);
 		gtk_clist_set_text(hl->table, j, 2, str);		
-		sprintf(str, "%u", hl->hosts[i].tx_bytes+hl->hosts[i].rx_bytes);
+		g_snprintf(str, 16, "%u", hl->hosts[i].tx_bytes+hl->hosts[i].rx_bytes);
 		gtk_clist_set_text(hl->table, j, 3, str);		
 
 
-		sprintf(str, "%u", hl->hosts[i].tx_frames);
+		g_snprintf(str, 16, "%u", hl->hosts[i].tx_frames);
 		gtk_clist_set_text(hl->table, j, 4, str);	
-		sprintf(str, "%u", hl->hosts[i].tx_bytes);
+		g_snprintf(str, 16, "%u", hl->hosts[i].tx_bytes);
 		gtk_clist_set_text(hl->table, j, 5, str);		
 
 
-		sprintf(str, "%u", hl->hosts[i].rx_frames);
+		g_snprintf(str, 16, "%u", hl->hosts[i].rx_frames);
 		gtk_clist_set_text(hl->table, j, 6, str);		
-		sprintf(str, "%u", hl->hosts[i].rx_bytes);
+		g_snprintf(str, 16, "%u", hl->hosts[i].rx_bytes);
 		gtk_clist_set_text(hl->table, j, 7, str);		
 
 	}
@@ -478,7 +478,7 @@ init_hostlist_table(gboolean hide_ports, char *table_name, char *tap_name, char
 	hosttable->name=table_name;
 	hosttable->win=gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(hosttable->win), 750, 400);
-	snprintf(title, 255, "%s: %s", table_name, cf_get_display_name(&cfile));
+	g_snprintf(title, 255, "%s: %s", table_name, cf_get_display_name(&cfile));
 	gtk_window_set_title(GTK_WINDOW(hosttable->win), title);
 
 	SIGNAL_CONNECT(hosttable->win, "destroy", hostlist_win_destroy_cb, hosttable);
@@ -664,19 +664,19 @@ add_hostlist_table_data(hostlist_table *hl, address *addr, guint32 src_port, gbo
 		entries[0]=address_to_str(&talker->src_address);
 		entries[1]=sport?sport:"";
 
-		sprintf(frames,"%u", talker->tx_frames+talker->rx_frames);
+		g_snprintf(frames, 16, "%u", talker->tx_frames+talker->rx_frames);
 		entries[2]=frames;
-		sprintf(bytes,"%u", talker->tx_bytes+talker->rx_bytes);
+		g_snprintf(bytes, 16, "%u", talker->tx_bytes+talker->rx_bytes);
 		entries[3]=bytes;
 
-		sprintf(txframes,"%u", talker->tx_frames);
+		g_snprintf(txframes, 16, "%u", talker->tx_frames);
 		entries[4]=txframes;
-		sprintf(txbytes,"%u", talker->tx_bytes);
+		g_snprintf(txbytes, 16, "%u", talker->tx_bytes);
 		entries[5]=txbytes;
 
-		sprintf(rxframes,"%u", talker->rx_frames);
+		g_snprintf(rxframes, 16, "%u", talker->rx_frames);
 		entries[6]=rxframes;
-		sprintf(rxbytes,"%u", talker->rx_bytes);
+		g_snprintf(rxbytes, 16, "%u", talker->rx_bytes);
 		entries[7]=rxbytes;
 
 		gtk_clist_insert(hl->table, talker_idx, entries);
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 087c3fa7b8..280e16452c 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1,7 +1,7 @@
 /* io_stat.c
  * io_stat   2002 Ronnie Sahlberg
  *
- * $Id: io_stat.c,v 1.72 2004/03/08 07:47:14 sahlberg Exp $
+ * $Id: io_stat.c,v 1.73 2004/03/13 15:15:24 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -486,18 +486,18 @@ get_it_value(io_stat_t *io, int graph_id, int idx)
 
 
 static void
-print_time_scale_string(char *buf, guint32 t)
+print_time_scale_string(char *buf, int buf_len, guint32 t)
 {
 	if(t>=10000000){
-		sprintf(buf, "%ds",t/1000000);
+		g_snprintf(buf, buf_len, "%ds",t/1000000);
 	} else if(t>=1000000){
-		sprintf(buf, "%d.%03ds",t/1000000,(t%1000000)/1000);
+		g_snprintf(buf, buf_len, "%d.%03ds",t/1000000,(t%1000000)/1000);
 	} else if(t>=10000){
-		sprintf(buf, "%dms",t/1000);
+		g_snprintf(buf, buf_len, "%dms",t/1000);
 	} else if(t>=1000){
-		sprintf(buf, "%d.%03dms",t/1000,t%1000);
+		g_snprintf(buf, buf_len, "%d.%03dms",t/1000,t%1000);
 	} else {
-		sprintf(buf, "%dus",t);
+		g_snprintf(buf, buf_len, "%dus",t);
 	}
 }
 
@@ -648,9 +648,9 @@ io_stat_draw(io_stat_t *io)
 	 * top y scale label will be the widest one
 	 */
 	if(draw_y_as_time){
-		print_time_scale_string(label_string, max_y);
+		print_time_scale_string(label_string, 15, max_y);
 	} else {
-		sprintf(label_string,"%d", max_y);
+		g_snprintf(label_string, 15, "%d", max_y);
 	}
 #if GTK_MAJOR_VERSION < 2
         label_width=gdk_string_width(font, label_string);
@@ -698,9 +698,9 @@ io_stat_draw(io_stat_t *io)
 		/* draw the labels */
 		if(i==0){
 			if(draw_y_as_time){
-				print_time_scale_string(label_string, (max_y*i/10));
+				print_time_scale_string(label_string, 15, (max_y*i/10));
 			} else {
-				sprintf(label_string,"%d", max_y*i/10);
+				g_snprintf(label_string, 15, "%d", max_y*i/10);
 			}
 #if GTK_MAJOR_VERSION < 2
 	                lwidth=gdk_string_width(font, label_string);
@@ -722,9 +722,9 @@ io_stat_draw(io_stat_t *io)
 		}
 		if(i==5){
 			if(draw_y_as_time){
-				print_time_scale_string(label_string, (max_y*i/10));
+				print_time_scale_string(label_string, 15, (max_y*i/10));
 			} else {
-				sprintf(label_string,"%d", max_y*i/10);
+				g_snprintf(label_string, 15, "%d", max_y*i/10);
 			}
 #if GTK_MAJOR_VERSION < 2
 	                lwidth=gdk_string_width(font, label_string);
@@ -746,9 +746,9 @@ io_stat_draw(io_stat_t *io)
 		}
 		if(i==10){
 			if(draw_y_as_time){
-				print_time_scale_string(label_string, (max_y*i/10));
+				print_time_scale_string(label_string, 15, (max_y*i/10));
 			} else {
-				sprintf(label_string,"%d", max_y*i/10);
+				g_snprintf(label_string, 15, "%d", max_y*i/10);
 			}
 #if GTK_MAJOR_VERSION < 2
 	                lwidth=gdk_string_width(font, label_string);
@@ -832,13 +832,13 @@ io_stat_draw(io_stat_t *io)
 		if(xlen==10){
 			int lwidth;
 			if(io->interval>=1000){
-				sprintf(label_string,"%ds", current_interval/1000);
+				g_snprintf(label_string, 15, "%ds", current_interval/1000);
 			} else if(io->interval>=100){
-				sprintf(label_string,"%d.%1ds", current_interval/1000,(current_interval/100)%10);
+				g_snprintf(label_string, 15, "%d.%1ds", current_interval/1000,(current_interval/100)%10);
 			} else if(io->interval>=10){
-				sprintf(label_string,"%d.%2ds", current_interval/1000,(current_interval/10)%100);
+				g_snprintf(label_string, 15, "%d.%2ds", current_interval/1000,(current_interval/10)%100);
 			} else {
-				sprintf(label_string,"%d.%3ds", current_interval/1000,current_interval%1000);
+				g_snprintf(label_string, 15, "%d.%3ds", current_interval/1000,current_interval%1000);
 			}
 #if GTK_MAJOR_VERSION < 2
                         lwidth=gdk_string_width(font, label_string);
@@ -1310,7 +1310,7 @@ create_pixels_per_tick_menu_items(io_stat_t *io, GtkWidget *menu)
 	int i;
 
 	for(i=0;i<MAX_PIXELS_PER_TICK;i++){
-		sprintf(str,"%d", pixels_per_tick[i]);
+		g_snprintf(str, 5, "%d", pixels_per_tick[i]);
 		menu_item=gtk_menu_item_new_with_label(str);
 
 		OBJECT_SET_DATA(menu_item, "pixels_per_tick",
@@ -1346,13 +1346,13 @@ create_tick_interval_menu_items(io_stat_t *io, GtkWidget *menu)
 
 	for(i=0;i<MAX_TICK_VALUES;i++){
 		if(tick_interval_values[i]>=1000){
-			sprintf(str,"%d sec", tick_interval_values[i]/1000);
+			g_snprintf(str, 15, "%d sec", tick_interval_values[i]/1000);
 		} else if(tick_interval_values[i]>=100){
-			sprintf(str,"0.%1d sec", (tick_interval_values[i]/100)%10);
+			g_snprintf(str, 15, "0.%1d sec", (tick_interval_values[i]/100)%10);
 		} else if(tick_interval_values[i]>=10){
-			sprintf(str,"0.%02d sec", (tick_interval_values[i]/10)%10);
+			g_snprintf(str, 15, "0.%02d sec", (tick_interval_values[i]/10)%10);
 		} else {
-			sprintf(str,"0.%03d sec", (tick_interval_values[i])%10);
+			g_snprintf(str, 15, "0.%03d sec", (tick_interval_values[i])%10);
 		}
 
 		menu_item=gtk_menu_item_new_with_label(str);
@@ -1377,7 +1377,7 @@ create_yscale_max_menu_items(io_stat_t *io, GtkWidget *menu)
 		if(yscale_max[i]==AUTO_MAX_YSCALE){
 			strcpy(str,"Auto");
 		} else {
-			sprintf(str,"%d", yscale_max[i]);
+			g_snprintf(str, 15, "%d", yscale_max[i]);
 		}
 		menu_item=gtk_menu_item_new_with_label(str);
 		OBJECT_SET_DATA(menu_item, "yscale_max", yscale_max[i]);
@@ -1751,7 +1751,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 	gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START);
 	gtk_widget_show(hbox);
 
-	sprintf(str, "Graph %d", num);
+	g_snprintf(str, 256, "Graph %d", num);
     gio->display_button=gtk_toggle_button_new_with_label(str);
 	gtk_box_pack_start(GTK_BOX(hbox), gio->display_button, FALSE, FALSE, 0);
 	gtk_widget_show(gio->display_button);
@@ -1790,7 +1790,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 	/* filter prefs dialog */
 	gio->filter_bt=BUTTON_NEW_FROM_STOCK(ETHEREAL_STOCK_DISPLAY_FILTER_ENTRY);
 
-	sprintf(str, "Ethereal: Display Filter  IO-Stat (Filter:%d)", num);
+	g_snprintf(str, 256, "Ethereal: Display Filter  IO-Stat (Filter:%d)", num);
 	if(gio->args->title){
 		free(gio->args->title);
 	}
@@ -1819,7 +1819,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num)
 	/*
 	 * create PlotStyle menu
 	 */
-	sprintf(str, " Style:");
+	g_snprintf(str, 256, " Style:");
 	label=gtk_label_new(str);
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index dea6e37db8..3e227b4744 100644
--- a/gtk/isup_stat.c
+++ b/gtk/isup_stat.c
@@ -5,7 +5,7 @@
  *
  * MUCH code modified from service_response_time_table.c.
  *
- * $Id: isup_stat.c,v 1.19 2004/02/23 19:19:37 ulfl Exp $
+ * $Id: isup_stat.c,v 1.20 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -122,7 +122,7 @@ isup_stat_draw(
     void		*tapdata)
 {
     int			i, j;
-    char		str[256], *strp;
+    char		*strp;
 
 
     tapdata = tapdata;
@@ -135,9 +135,8 @@ isup_stat_draw(
 	{
 	    j = gtk_clist_find_row_from_data(GTK_CLIST(dlg.table), (gpointer) i);
 
-	    sprintf(str, "%d",
-		stat.message_type[isup_message_type_value[i].value]);
-	    strp = g_strdup(str);
+	    strp = g_strdup_printf("%d",
+		    stat.message_type[isup_message_type_value[i].value]);
 	    gtk_clist_set_text(GTK_CLIST(dlg.table), j, 3, strp);
 	    g_free(strp);
 
@@ -430,7 +429,7 @@ isup_stat_gtk_cb(
     i = 0;
     while (isup_message_type_value[i].strptr)
     {
-	sprintf(str, "%u", isup_message_type_value[i].value);
+	g_snprintf(str, 100, "%u", isup_message_type_value[i].value);
 	dlg.entries[0] = g_strdup(str);
 
 	dlg.entries[1] = g_strdup(isup_message_type_value_acro[i].strptr);
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 9ae11603d5..ee989f2e52 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -1,7 +1,7 @@
 /* ldap_stat.c
  * ldap_stat   2003 Ronnie Sahlberg
  *
- * $Id: ldap_stat.c,v 1.17 2004/02/27 19:07:19 ulfl Exp $
+ * $Id: ldap_stat.c,v 1.18 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -174,7 +174,7 @@ gtk_ldapstat_init(char *optarg)
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	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);
 	gtk_widget_show(label);
diff --git a/gtk/main.c b/gtk/main.c
index 0ece74644b..7b7a1fd2e3 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.413 2004/03/13 14:07:14 ulfl Exp $
+ * $Id: main.c,v 1.414 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -56,10 +56,6 @@
 #include <io.h> /* open/close on win32 */
 #endif
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #ifdef NEED_STRERROR_H
 #include "strerror.h"
 #endif
@@ -231,7 +227,7 @@ about_ethereal( GtkWidget *w _U_, gpointer data _U_ )
   gtk_widget_show(top_hb);
 
   /* Construct the message string */
-  snprintf(message, MAX_ABOUT_MSG_LEN,
+  g_snprintf(message, MAX_ABOUT_MSG_LEN,
 	   "Ethereal - Network Protocol Analyzer\n\n"
 	   
 	   "Version " VERSION
@@ -628,7 +624,7 @@ get_text_from_packet_list(gpointer data)
 	    len = strlen(cfile.cinfo.col_expr[column]) +
 		  strlen(cfile.cinfo.col_expr_val[column]) + 5;
 	    buf = g_malloc0(len);
-	    snprintf(buf, len, "%s == %s", cfile.cinfo.col_expr[column],
+	    g_snprintf(buf, len, "%s == %s", cfile.cinfo.col_expr[column],
 		     cfile.cinfo.col_expr_val[column]);
     	}
 
diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index 1e662d7f29..210d036e5f 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.c
@@ -1,7 +1,7 @@
 /* nameres_prefs.c
  * Dialog box for name resolution preferences
  *
- * $Id: nameres_prefs.c,v 1.8 2003/07/22 03:14:31 gerald Exp $
+ * $Id: nameres_prefs.c,v 1.9 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -108,7 +108,7 @@ nameres_prefs_show(void)
 	OBJECT_SET_DATA(main_vb, C_RESOLVE_KEY, c_resolv_cb);
 
 	/* Max concurrent requests */
-	sprintf(concur_str, "%d", prefs.name_resolve_concurrency);
+	g_snprintf(concur_str, 10+1, "%d", prefs.name_resolve_concurrency);
 	resolv_concurrency_te = create_preference_entry(main_tb, 4, 
 	    "Maximum concurrent requests:", NULL, concur_str);
 	OBJECT_SET_DATA(main_vb, RESOLVE_CONCURRENCY_KEY, resolv_concurrency_te);
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 0fb567bd51..2d2957d473 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -1,7 +1,7 @@
 /* prefs_dlg.c
  * Routines for handling preferences
  *
- * $Id: prefs_dlg.c,v 1.79 2004/02/06 19:19:10 ulfl Exp $
+ * $Id: prefs_dlg.c,v 1.80 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -151,15 +151,15 @@ pref_show(pref_t *pref, gpointer user_data)
     switch (pref->info.base) {
 
     case 10:
-      sprintf(uint_str, "%u", pref->saved_val.uint);
+      g_snprintf(uint_str, 10+1, "%u", pref->saved_val.uint);
       break;
 
     case 8:
-      sprintf(uint_str, "%o", pref->saved_val.uint);
+      g_snprintf(uint_str, 10+1, "%o", pref->saved_val.uint);
       break;
 
     case 16:
-      sprintf(uint_str, "%x", pref->saved_val.uint);
+      g_snprintf(uint_str, 10+1, "%x", pref->saved_val.uint);
       break;
     }
     pref->control = create_preference_entry(main_tb, pref->ordinal,
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 705618d61b..79750ef09d 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -1,7 +1,7 @@
 /* rpc_stat.c
  * rpc_stat   2002 Ronnie Sahlberg
  *
- * $Id: rpc_stat.c,v 1.42 2004/02/27 19:07:20 ulfl Exp $
+ * $Id: rpc_stat.c,v 1.43 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -248,7 +248,7 @@ gtk_rpcstat_init(char *optarg)
 	gtk_box_pack_start(GTK_BOX(vbox), stat_label, FALSE, FALSE, 0);
 	gtk_widget_show(stat_label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	g_snprintf(filter_string,255,"Filter:%s",filter?filter:"");
 	filter_label=gtk_label_new(filter_string);
 	gtk_box_pack_start(GTK_BOX(vbox), filter_label, FALSE, FALSE, 0);
 	gtk_widget_show(filter_label);
@@ -338,7 +338,7 @@ rpcstat_program_select(GtkWidget *item _U_, gpointer key)
 	for(i=rpc_min_vers;i<=rpc_max_vers;i++){
 		GtkWidget *menu_item;
 		char vs[5];
-		sprintf(vs,"%d",i);
+		g_snprintf(vs, 5, "%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
 		SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
                                i);
@@ -444,7 +444,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_)
 	for(i=rpc_min_vers;i<=rpc_max_vers;i++){
 		GtkWidget *menu_item;
 		char vs[5];
-		sprintf(vs,"%d",i);
+		g_snprintf(vs, 5, "%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
 		SIGNAL_CONNECT(menu_item, "activate", rpcstat_version_select,
                                i);
diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 5662985858..bebe8d534e 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.c
@@ -3,7 +3,7 @@
  * Helper routines common to all service response time statistics
  * tap.
  *
- * $Id: service_response_time_table.c,v 1.15 2004/02/23 22:48:52 guy Exp $
+ * $Id: service_response_time_table.c,v 1.16 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -183,27 +183,27 @@ srt_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callba
 	switch(type){
 	case 0:
 		/* selected */
-		snprintf(str, 255, "%s==%d", rst->filter_string, selection);
+		g_snprintf(str, 255, "%s==%d", rst->filter_string, selection);
 		break;
 	case 1:
 		/* not selected */
-		snprintf(str, 255, "!(%s==%d)", rst->filter_string, selection);
+		g_snprintf(str, 255, "!(%s==%d)", rst->filter_string, selection);
 		break;
 	case 2:
 		/* and selected */
-		snprintf(str, 255, "(%s) && (%s==%d)", current_filter, rst->filter_string, selection);
+		g_snprintf(str, 255, "(%s) && (%s==%d)", current_filter, rst->filter_string, selection);
 		break;
 	case 3:
 		/* or selected */
-		snprintf(str, 255, "(%s) || (%s==%d)", current_filter, rst->filter_string, selection);
+		g_snprintf(str, 255, "(%s) || (%s==%d)", current_filter, rst->filter_string, selection);
 		break;
 	case 4:
 		/* and not selected */
-		snprintf(str, 255, "(%s) && !(%s==%d)", current_filter, rst->filter_string, selection);
+		g_snprintf(str, 255, "(%s) && !(%s==%d)", current_filter, rst->filter_string, selection);
 		break;
 	case 5:
 		/* or not selected */
-		snprintf(str, 255, "(%s) || !(%s==%d)", current_filter, rst->filter_string, selection);
+		g_snprintf(str, 255, "(%s) || !(%s==%d)", current_filter, rst->filter_string, selection);
 		break;
 	}
 
@@ -431,7 +431,7 @@ init_srt_table_row(srt_stat_table *rst, int index, char *procedure)
 	char str[10];
 
 
-	sprintf(str,"%d",index);
+	g_snprintf(str, 10, "%d",index);
 	rst->procedures[index].entries[0]=g_strdup(str);
 
 	rst->procedures[index].entries[1]=g_strdup(procedure);
@@ -518,27 +518,27 @@ draw_srt_table_data(srt_stat_table *rst)
 		}
 
 		j=gtk_clist_find_row_from_data(rst->table, (gpointer)i);
-		sprintf(str,"%d", rst->procedures[i].num);
+		g_snprintf(str, 256, "%d", rst->procedures[i].num);
 		strp=g_strdup(str);
 		gtk_clist_set_text(rst->table, j, 2, strp);
 		g_free(rst->procedures[i].entries[2]);
 		rst->procedures[i].entries[2]=strp;
 
 
-		sprintf(str,"%3d.%05d", (int)rst->procedures[i].min.secs,rst->procedures[i].min.nsecs/10000);
+		g_snprintf(str, 256, "%3d.%05d", (int)rst->procedures[i].min.secs,rst->procedures[i].min.nsecs/10000);
 		strp=g_strdup(str);
 		gtk_clist_set_text(rst->table, j, 3, strp);
 		g_free(rst->procedures[i].entries[3]);
 		rst->procedures[i].entries[3]=strp;
 
 
-		sprintf(str,"%3d.%05d", (int)rst->procedures[i].max.secs,rst->procedures[i].max.nsecs/10000);
+		g_snprintf(str, 256, "%3d.%05d", (int)rst->procedures[i].max.secs,rst->procedures[i].max.nsecs/10000);
 		strp=g_strdup(str);
 		gtk_clist_set_text(rst->table, j, 4, strp);
 		g_free(rst->procedures[i].entries[4]);
 		rst->procedures[i].entries[4]=strp;
 
-		sprintf(str,"%3d.%05d", td/100000, td%100000);
+		g_snprintf(str, 256, "%3d.%05d", td/100000, td%100000);
 		strp=g_strdup(str);
 		gtk_clist_set_text(rst->table, j, 5, strp);
 		g_free(rst->procedures[i].entries[5]);
diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
index 253124579a..07a2cb3730 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.c
@@ -1,7 +1,7 @@
 /* simple_dialog.c
  * Simple message dialog box routines.
  *
- * $Id: simple_dialog.c,v 1.28 2004/02/23 00:05:50 guy Exp $
+ * $Id: simple_dialog.c,v 1.29 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,10 +30,6 @@
 
 #include <stdio.h>
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include "gtkglobals.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 0515bdab8f..244541f0f8 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -1,7 +1,7 @@
 /* smb_stat.c
  * smb_stat   2003 Ronnie Sahlberg
  *
- * $Id: smb_stat.c,v 1.40 2004/02/27 19:07:20 ulfl Exp $
+ * $Id: smb_stat.c,v 1.41 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -182,7 +182,7 @@ gtk_smbstat_init(char *optarg)
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
-	snprintf(filter_string,255,"Filter:%s",filter?filter:"");
+	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);
 	gtk_widget_show(label);
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index cec8321a11..d609cdd99d 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -1,7 +1,7 @@
 /* summary_dlg.c
  * Routines for capture file summary window
  *
- * $Id: summary_dlg.c,v 1.27 2004/02/13 00:53:36 guy Exp $
+ * $Id: summary_dlg.c,v 1.28 2004/03/13 15:15:25 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -32,10 +32,6 @@
 
 #include <wtap.h>
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include "summary.h"
 #include "summary_dlg.h"
 #include "dlg_utils.h"
@@ -96,20 +92,20 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_show(file_box);
 
   /* filename */
-  snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename);
+  g_snprintf(string_buff, SUM_STR_MAX, "Name: %s", summary.filename);
   add_string_to_box(string_buff, file_box);
 
   /* length */
-  snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length);
+  g_snprintf(string_buff, SUM_STR_MAX, "Length: %lu", summary.file_length);
   add_string_to_box(string_buff, file_box);
 
   /* format */
-  snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.encap_type));
+  g_snprintf(string_buff, SUM_STR_MAX, "Format: %s", wtap_file_type_string(summary.encap_type));
   add_string_to_box(string_buff, file_box);
 
   if (summary.has_snap) {
     /* snapshot length */
-    snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap);
+    g_snprintf(string_buff, SUM_STR_MAX, "Snapshot length: %u", summary.snap);
     add_string_to_box(string_buff, file_box);
   }
 
@@ -124,14 +120,14 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_show(data_box);
 
   /* seconds */
-  snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time);
+  g_snprintf(string_buff, SUM_STR_MAX, "Elapsed time: %.3f seconds", summary.elapsed_time);
   add_string_to_box(string_buff, data_box);
 
-  snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
+  g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
   add_string_to_box(string_buff, data_box);
 
   /* Packet count */
-  snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count);
+  g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.packet_count);
   add_string_to_box(string_buff, data_box);
 
   /* Filtered Packet count */
@@ -140,39 +136,39 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 	add_string_to_box("Filtered packet count: 0", data_box);
 
   /* Marked Packet count */
-  snprintf(string_buff, SUM_STR_MAX, "Marked packet count: %i", summary.marked_count);
+  g_snprintf(string_buff, SUM_STR_MAX, "Marked packet count: %i", summary.marked_count);
   add_string_to_box(string_buff, data_box);
 
   /* Packets per second */
   if (seconds > 0){
-    snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.packet_count/seconds);
+    g_snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.packet_count/seconds);
     add_string_to_box(string_buff, data_box);
   }
 
   /* Packet size */
   if (summary.packet_count > 0){
-    snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
+    g_snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
       (float)summary.bytes/summary.packet_count);
     add_string_to_box(string_buff, data_box);
   }
 
   /* Dropped count */
   if (summary.drops_known) {
-    snprintf(string_buff, SUM_STR_MAX, "Dropped packets: %u", summary.drops);
+    g_snprintf(string_buff, SUM_STR_MAX, "Dropped packets: %u", summary.drops);
     add_string_to_box(string_buff, data_box);
   }
 
   /* Byte count */
-  snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.bytes);
+  g_snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.bytes);
   add_string_to_box(string_buff, data_box);
 
   /* Bytes per second */
   if (seconds > 0){
-    snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.bytes/seconds);
+    g_snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.bytes/seconds);
     add_string_to_box(string_buff, data_box);
 
     /* MBit per second */
-    snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
+    g_snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
              summary.bytes * 8.0 / (seconds * 1000.0 * 1000.0));
     add_string_to_box(string_buff, data_box);
   }
@@ -209,43 +205,43 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 
     /* seconds */
     seconds = (summary.filtered_stop - summary.filtered_start);
-    snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
+    g_snprintf(string_buff, SUM_STR_MAX, "Between first and last packet: %.3f seconds", seconds);
     add_string_to_box(string_buff, filter_box);
 
     /* Packet count */
-    snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.filtered_count);
+    g_snprintf(string_buff, SUM_STR_MAX, "Packet count: %i", summary.filtered_count);
     add_string_to_box(string_buff, filter_box);
 
     /* Packets per second */
     if (seconds > 0){
-      snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.filtered_count/seconds);
+      g_snprintf(string_buff, SUM_STR_MAX, "Avg. packets/sec: %.3f", summary.filtered_count/seconds);
       add_string_to_box(string_buff, filter_box);
     }
 
     /* Packet size */
     if (summary.filtered_count > 0){
-      snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
+      g_snprintf(string_buff, SUM_STR_MAX, "Avg. packet size: %.3f bytes",
           (float) summary.filtered_bytes/summary.filtered_count);
       add_string_to_box(string_buff, filter_box);
     }
 
     /* Byte count */
-    snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.filtered_bytes);
+    g_snprintf(string_buff, SUM_STR_MAX, "Bytes of traffic: %d", summary.filtered_bytes);
     add_string_to_box(string_buff, filter_box);
 
     /* Bytes per second */
     if (seconds > 0){
-      snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.filtered_bytes/seconds);
+      g_snprintf(string_buff, SUM_STR_MAX, "Avg. bytes/sec: %.3f", summary.filtered_bytes/seconds);
       add_string_to_box(string_buff, filter_box);
 
       /* MBit per second */
-      snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
+      g_snprintf(string_buff, SUM_STR_MAX, "Avg. Mbit/sec: %.3f",
 	       summary.filtered_bytes * 8.0 / (seconds * 1000.0 * 1000.0));
       add_string_to_box(string_buff, filter_box);
     }
   } else {
     /* Display filter */
-    snprintf(string_buff, SUM_STR_MAX, "Display filter: none");
+    g_snprintf(string_buff, SUM_STR_MAX, "Display filter: none");
     add_string_to_box(string_buff, filter_box);
   }
 
@@ -261,18 +257,18 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 
   /* interface */
   if (summary.iface) {
-    snprintf(string_buff, SUM_STR_MAX, "Interface: %s", summary.iface);
+    g_snprintf(string_buff, SUM_STR_MAX, "Interface: %s", summary.iface);
   } else {
-    sprintf(string_buff, "Interface: unknown");
+    g_snprintf(string_buff, SUM_STR_MAX, "Interface: unknown");
   }
   add_string_to_box(string_buff, capture_box);
 
 #ifdef HAVE_LIBPCAP
   /* Capture filter */
   if (summary.cfilter && summary.cfilter[0] != '\0') {
-    snprintf(string_buff, SUM_STR_MAX, "Capture filter: %s", summary.cfilter);
+    g_snprintf(string_buff, SUM_STR_MAX, "Capture filter: %s", summary.cfilter);
   } else {
-    sprintf(string_buff, "Capture filter: none");
+    g_snprintf(string_buff, SUM_STR_MAX, "Capture filter: none");
   }
   add_string_to_box(string_buff, capture_box);
 #endif
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index eb902dd208..847d5d7c1d 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -3,7 +3,7 @@
  * By Pavel Mores <pvl@uh.cz>
  * Win32 port:  rwh@unifiedtech.com
  *
- * $Id: tcp_graph.c,v 1.57 2004/02/27 10:03:48 sahlberg Exp $
+ * $Id: tcp_graph.c,v 1.58 2004/03/13 15:15:26 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -33,10 +33,6 @@
 #include <math.h>		/* rint() */
 #include <string.h>
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include "ipproto.h"
 #include "globals.h" 		/* cfile */
 #include <epan/packet.h>	/* frame_data */
@@ -638,7 +634,7 @@ static void display_text (struct graph *g)
 #if GTK_MAJOR_VERSION < 2
 	gtk_text_freeze (GTK_TEXT (g->text));
 #endif
-	snprintf ((char * )line, 256, "%10s%15s%15s%15s%15s%15s%15s%10s\n",
+	g_snprintf ((char * )line, 256, "%10s%15s%15s%15s%15s%15s%15s%10s\n",
 					"pkt num", "time", "delta first", "delta prev",
 					"seqno", "delta first", "delta prev", "data (B)");
 	gtk_text_insert (GTK_TEXT (g->text), g->font, NULL, NULL,
@@ -677,7 +673,7 @@ static void display_text (struct graph *g)
 			seq_opposite_prev = seq;
 			c = &color;
 		}
-		snprintf ((char *)line, 256, "%10d%15.6f%15.6f%15.6f%15u%15d%15d%10u\n",
+		g_snprintf ((char *)line, 256, "%10d%15.6f%15.6f%15.6f%15u%15d%15d%10u\n",
 						ptr->num, time, time-first_time, time-prev_time,
 						seq, seq_delta_isn, seq_delta_prev,
 						g_ntohs (ptr->iphdr.tot_len) - 4*IHL(&(ptr->iphdr)) -
@@ -712,7 +708,7 @@ static void create_drawing_area (struct graph *g)
 							"-*-*-m-*-iso8859-2");
 #endif
 	get_headers (cfile.current_frame, cfile.pd, &current);
-	snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %d.%d.%d.%d:%d -> %d.%d.%d.%d:%d",
+	g_snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %d.%d.%d.%d:%d -> %d.%d.%d.%d:%d",
 					refnum,
 					cf_get_display_name(&cfile),
 					(current.iphdr.saddr    )&0xff,
@@ -884,7 +880,7 @@ static void control_panel_create (struct graph *g)
 	control_panel_add_cross_page (g, notebook);
 	control_panel_add_graph_type_page (g, notebook);
 
-	snprintf (window_title, WINDOW_TITLE_LENGTH,
+	g_snprintf (window_title, WINDOW_TITLE_LENGTH,
 				"Graph %d - Control - Ethereal", refnum);
 	toplevel = window_new (GTK_WINDOW_TOPLEVEL, window_title);
 	SIGNAL_CONNECT(toplevel, "destroy", callback_toplevel_destroy, g);
@@ -1253,9 +1249,9 @@ static void update_zoom_spins (struct graph *g)
 {
 	char s[32];
 
-	snprintf (s, 32, "%.3f", g->zoom.x / g->zoom.initial.x);
+	g_snprintf (s, 32, "%.3f", g->zoom.x / g->zoom.initial.x);
 	gtk_entry_set_text (g->zoom.widget.h_zoom, s);
-	snprintf (s, 32, "%.3f", g->zoom.y / g->zoom.initial.y);
+	g_snprintf (s, 32, "%.3f", g->zoom.y / g->zoom.initial.y);
 	gtk_entry_set_text (g->zoom.widget.v_zoom, s);
 }
 
@@ -2257,7 +2253,7 @@ static void v_axis_pixmap_draw (struct axis *axis)
 			continue;
 		gdk_draw_line (axis->pixmap[not_disp], g->fg_gc,
                                axis->s.width - 15, y, axis->s.width - 1, y);
-		snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
+		g_snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
 #if GTK_MAJOR_VERSION < 2
 		w = gdk_string_width(g->font, desc);
 		h = gdk_string_height(g->font, desc);
@@ -2360,7 +2356,7 @@ static void h_axis_pixmap_draw (struct axis *axis)
 		if (x < 0 || x > axis->s.width)
 			continue;
 		gdk_draw_line (axis->pixmap[not_disp], g->fg_gc, x, 0, x, 15);
-		snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
+		g_snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
 #if GTK_MAJOR_VERSION < 2
 		w = gdk_string_width (g->font, desc);
 		h = gdk_string_height (g->font, desc);
@@ -2544,7 +2540,7 @@ static int get_label_dim (struct axis *axis, int dir, double label)
 			break;
 		y = y - floor (y);
 	}
-	snprintf (str, 32, "%.*f", rdigits, label);
+	g_snprintf (str, 32, "%.*f", rdigits, label);
 	switch (dir) {
 	case AXIS_HORIZONTAL:
 #if GTK_MAJOR_VERSION < 2
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 45043edcf9..b8458df499 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -1,7 +1,7 @@
 /* wsp_stat.c
  * wsp_stat   2003 Jean-Michel FAYARD
  *
- * $Id: wsp_stat.c,v 1.23 2004/03/13 12:09:27 ulfl Exp $
+ * $Id: wsp_stat.c,v 1.24 2004/03/13 15:15:26 ulfl Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -88,8 +88,10 @@ wsp_reset_hash(gchar *key _U_ , wsp_status_code_t *data, gpointer ptr _U_ )
  * or create it if it don't exist.
  */
 static void
-wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * string_buff )
+wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * unused _U_ )
 {
+	char string_buff[256];
+
 	if ((data==NULL) || (data->packets==0))
 		return;
 	if (data->widget==NULL){	/* create an entry in the table */
@@ -99,13 +101,13 @@ wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * string_buff
 
 
 		/* Maybe we should display the hexadecimal value ? */
-		/* sprintf(string_buff, "%s  (0X%x)", data->name, *key); */
+		/* g_snprintf(string_buff, 256, "%s  (0X%x)", data->name, *key); */
 		tmp = gtk_label_new( data->name  /* string_buff */ );
 		gtk_table_attach_defaults(GTK_TABLE(data->sp->table_status_code), tmp, x, x+1, y, y+1);
 		gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT);
 		gtk_widget_show(tmp);
 
-		sprintf( string_buff, "%9d", data->packets );
+		g_snprintf( string_buff, 256, "%9d", data->packets );
 		data->widget = gtk_label_new( string_buff );
 		gtk_table_attach_defaults(GTK_TABLE(data->sp->table_status_code), data->widget, x+1, x+2, y, y+1);
 		gtk_label_set_justify(GTK_LABEL(data->widget), GTK_JUSTIFY_LEFT);
@@ -114,7 +116,7 @@ wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * string_buff
 		data->sp->index++;
 	} else {
 		/* Just update the label string */
-		sprintf( string_buff, "%9d", data->packets );
+		g_snprintf( string_buff, 256, "%9d", data->packets );
 		gtk_label_set( GTK_LABEL(data->widget), string_buff);
 	}
 }
@@ -209,12 +211,12 @@ wspstat_draw(void *psp)
 
 	for(i=1;i<=sp->num_pdus ; i++)
 	{
-		sprintf(str, "%9d",  sp->pdu_stats[i ].packets);
+		g_snprintf(str, 256, "%9d",  sp->pdu_stats[i ].packets);
 		gtk_label_set( GTK_LABEL(sp->pdu_stats[i].widget), str);
 	}
 
 	index=sp->index;
-	g_hash_table_foreach( sp->hash, (GHFunc) wsp_draw_statuscode, str );
+	g_hash_table_foreach( sp->hash, (GHFunc) wsp_draw_statuscode, NULL );
 	if (index != sp->index){
 		/* We have inserted a new entry corresponding to a status code ,
 		 * let's resize the table */
@@ -283,7 +285,7 @@ wsp_init_table(wspstat_t *sp)
 			x=2;
 		}
 		/* Maybe we should display the hexadecimal value ? */
-		/* snprintf(buffer, 50, "%s  (0X%x)", match_strval( index2pdut( i ), vals_pdu_type), index2pdut(i) );*/
+		/* g_snprintf(buffer, 50, "%s  (0X%x)", match_strval( index2pdut( i ), vals_pdu_type), index2pdut(i) );*/
 		add_table_entry( sp, 
 				match_strval(index2pdut(i), vals_pdu_type), /* or buffer, */
 				x,