As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places;

svn path=/trunk/; revision=27800

25 files changed, 207 insertions, 204 deletions

diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c
index ecddef8533..2b2d122d02 100644
--- a/gtk/airpcap_gui_utils.c
+++ b/gtk/airpcap_gui_utils.c
@@ -734,9 +734,9 @@ airpcap_update_channel_offset_combo_entry(GtkWidget* w, gchar extChannel)
     gchar channel_offset_value[3];
 
     if (extChannel > 0){
-        g_snprintf(channel_offset_value, 3, "+%d", extChannel);
+        g_snprintf(channel_offset_value, sizeof(channel_offset_value), "+%d", extChannel);
     }else{
-        g_snprintf(channel_offset_value, 3, "%d", extChannel);
+        g_snprintf(channel_offset_value, sizeof(channel_offset_value), "%d", extChannel);
     }
 
     gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(w)->entry), channel_offset_value);
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index f12a87c9ad..ffd35bcede 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -91,13 +91,13 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * unused
 
 
 		/* Maybe we should display the hexadecimal value ? */
-		/* g_snprintf(string_buff, 256, "%s  (0X%x)", data->name, *key); */
+		/* g_snprintf(string_buff, sizeof(string_buff), "%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);
 
-		g_snprintf( string_buff, 256, "%9d", data->packets );
+		g_snprintf( string_buff, sizeof(string_buff), "%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);
@@ -106,8 +106,8 @@ dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * unused
 		data->sp->index++;
 	} else {
 		/* Just update the label string */
-		g_snprintf( string_buff, 256, "%9d", data->packets );
-		 gtk_label_set_text( GTK_LABEL(data->widget), string_buff);
+		g_snprintf( string_buff, sizeof(string_buff), "%9d", data->packets );
+		gtk_label_set_text( GTK_LABEL(data->widget), string_buff);
 	}
 }
 static void
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 5720401adf..d227e3afd1 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -729,9 +729,9 @@ add_filter_to_list(gpointer filter_arg, gpointer list_arg)
   if( strstr(colorf->filter_name,TEMP_COLOR_PREFIX)==NULL) {
     store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list_arg)));
     gtk_list_store_append(store, &iter);
-    g_snprintf(fg_str, 14, "#%04X%04X%04X",
+    g_snprintf(fg_str, sizeof(fg_str), "#%04X%04X%04X",
             colorf->fg_color.red, colorf->fg_color.green, colorf->fg_color.blue);
-    g_snprintf(bg_str, 14, "#%04X%04X%04X",
+    g_snprintf(bg_str, sizeof(bg_str), "#%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,
diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 7146f35114..009a72ce40 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -414,9 +414,9 @@ edit_color_filter_ok_cb                (GtkButton       *button,
 	colorf->disabled = filter_disabled;
         gdkcolor_to_color_t(&colorf->fg_color, &new_fg_color);
         gdkcolor_to_color_t(&colorf->bg_color, &new_bg_color);
-        g_snprintf(fg_str, 14, "#%04X%04X%04X",
+        g_snprintf(fg_str, sizeof(fg_str), "#%04X%04X%04X",
                 new_fg_color.red, new_fg_color.green, new_fg_color.blue);
-        g_snprintf(bg_str, 14, "#%04X%04X%04X",
+        g_snprintf(bg_str, sizeof(bg_str), "#%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 c34e1e7b97..ad77538a88 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.c
@@ -402,7 +402,7 @@ dcerpcstat_find_vers(gpointer *key, gpointer *value _U_, gpointer *user_data _U_
 		return NULL;
 	}
 
-	g_snprintf(vs, 5, "%u",k->ver);
+	g_snprintf(vs, sizeof(vs), "%u",k->ver);
 	menu_item=gtk_menu_item_new_with_label(vs);
 	g_signal_connect(menu_item, "activate", G_CALLBACK(dcerpcstat_version_select),
                        (gpointer)((long)k->ver));
@@ -449,7 +449,7 @@ dcerpcstat_add_program_to_menu(dcerpc_uuid_key *k, dcerpc_uuid_value *v)
 	case 0:
 
 		first_menu_name=v->name;
-		g_snprintf(str,63,"%s ...",v->name);
+		g_snprintf(str,sizeof(str),"%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);
@@ -466,7 +466,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:
-		g_snprintf(str,63,"%s - %s",first_menu_name,v->name);
+		g_snprintf(str,sizeof(str),"%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 0c016d6dec..8f1e928066 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1055,13 +1055,13 @@ decode_add_srcdst_menu (GtkWidget *page)
 
     optmenu = gtk_option_menu_new();
     menu = gtk_menu_new();
-    g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport);
+    g_snprintf(tmp, sizeof(tmp), "source (%u)", cfile.edt->pi.srcport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_SPORT));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
     gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
 
-    g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport);
+    g_snprintf(tmp, sizeof(tmp), "destination (%u)", cfile.edt->pi.destport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_DPORT));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1092,7 +1092,7 @@ decode_add_ppid_menu (GtkWidget *page)
     optmenu = gtk_option_menu_new();
     menu = gtk_menu_new();
     
-    g_snprintf(tmp, 100, "PPID (%u)", 0);
+    g_snprintf(tmp, sizeof(tmp), "PPID (%u)", 0);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1100,13 +1100,13 @@ decode_add_ppid_menu (GtkWidget *page)
     
     for(number_of_ppid = 0; number_of_ppid < MAX_NUMBER_OF_PPIDS; number_of_ppid++)
       if (cfile.edt->pi.ppids[number_of_ppid] != 0) {
-        g_snprintf(tmp, 100, "PPID (%u)", cfile.edt->pi.ppids[number_of_ppid]);
-        menuitem = gtk_menu_item_new_with_label(tmp);
-        g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID + 1 + number_of_ppid));
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-        gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
+          g_snprintf(tmp, sizeof(tmp), "PPID (%u)", cfile.edt->pi.ppids[number_of_ppid]);
+          menuitem = gtk_menu_item_new_with_label(tmp);
+          g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID + 1 + number_of_ppid));
+          gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+          gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
       } else
-        break;
+          break;
 
     g_object_set_data(G_OBJECT(page), E_MENU_SRCDST, menu);
     gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
@@ -1491,14 +1491,14 @@ decode_sctp_update_ppid_menu(GtkWidget *w _U_, GtkWidget *page)
 
     menu = gtk_menu_new();
 
-    g_snprintf(tmp, 100, "PPID (%u)", 0);
+    g_snprintf(tmp, sizeof(tmp), "PPID (%u)", 0);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
     gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
     for(number_of_ppid = 0; number_of_ppid < MAX_NUMBER_OF_PPIDS; number_of_ppid++)
       if (cfile.edt->pi.ppids[number_of_ppid] != 0) {
-        g_snprintf(tmp, 100, "PPID (%u)", cfile.edt->pi.ppids[number_of_ppid]);
+        g_snprintf(tmp, sizeof(tmp), "PPID (%u)", cfile.edt->pi.ppids[number_of_ppid]);
         menuitem = gtk_menu_item_new_with_label(tmp);
         g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_PPID + 1 + number_of_ppid));
         gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1527,13 +1527,13 @@ decode_sctp_update_srcdst_menu(GtkWidget *w _U_, GtkWidget *page)
     GtkListStore *sctp_store;
 
     menu = gtk_menu_new();
-    g_snprintf(tmp, 100, "source (%u)", cfile.edt->pi.srcport);
+    g_snprintf(tmp, sizeof(tmp), "source (%u)", cfile.edt->pi.srcport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_SPORT));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
     gtk_widget_show(menuitem);	/* gtk_widget_show_all() doesn't show this */
 
-    g_snprintf(tmp, 100, "destination (%u)", cfile.edt->pi.destport);
+    g_snprintf(tmp, sizeof(tmp), "destination (%u)", cfile.edt->pi.destport);
     menuitem = gtk_menu_item_new_with_label(tmp);
     g_object_set_data(G_OBJECT(menuitem), "user_data", GINT_TO_POINTER(E_DECODE_DPORT));
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -1658,7 +1658,7 @@ decode_add_notebook (GtkWidget *format_hb)
 
     /* Add link level selection page */
     if (cfile.edt->pi.ethertype) {
-	g_snprintf(buffer, 40, "Ethertype 0x%04x", cfile.edt->pi.ethertype);
+	g_snprintf(buffer, sizeof(buffer), "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);
@@ -1666,7 +1666,7 @@ decode_add_notebook (GtkWidget *format_hb)
 
     /* Add mpls selection page */
     if (cfile.edt->pi.mpls_label) {
-	g_snprintf(buffer, 40, "Data after label %u", cfile.edt->pi.mpls_label);
+	g_snprintf(buffer, sizeof(buffer), "Data after label %u", cfile.edt->pi.mpls_label);
 	page = decode_add_simple_page(buffer, "MPLS", "mpls.label", cfile.edt->pi.mpls_label);
 	label = gtk_label_new("MPLS");
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, label);
@@ -1677,7 +1677,7 @@ decode_add_notebook (GtkWidget *format_hb)
 	/*
 	 * The network-layer protocol is IP.
 	 */
-	g_snprintf(buffer, 40, "IP protocol %u", cfile.edt->pi.ipproto);
+	g_snprintf(buffer, sizeof(buffer), "IP protocol %u", cfile.edt->pi.ipproto);
 	page = decode_add_simple_page(buffer, "Network", "ip.proto", cfile.edt->pi.ipproto);
 	g_object_set_data(G_OBJECT(page), E_PAGE_ACTION, decode_simple);
 	label = gtk_label_new("Network");
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 71adc926d9..1e7f583541 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -164,49 +164,49 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
         case ACTYPE_SELECTED:
             /* if no expert item was passed */
             if (err->procedures[selection].fvalue_value==NULL) {
-                g_strlcpy(str, err->procedures[selection].entries[2], 256);
+                g_strlcpy(str, err->procedures[selection].entries[2], sizeof(str));
             }
             else
             {
                 /* expert item exists. Use it. */
-                g_strlcpy(str, err->procedures[selection].fvalue_value, 256);
+                g_strlcpy(str, err->procedures[selection].fvalue_value, sizeof(str));
             }
             break;
         case ACTYPE_NOT_SELECTED:
             /* if no expert item was passed */
             if (err->procedures[selection].fvalue_value==NULL) {
-                g_snprintf(str, 255, "!%s", err->procedures[selection].entries[2]);
+                g_snprintf(str, sizeof(str), "!%s", err->procedures[selection].entries[2]);
             }
             else
             {
                 /* expert item exists. Use it. */
-                g_snprintf(str, 255, "!(%s)", err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "!(%s)", err->procedures[selection].fvalue_value);
             }
             break;
             /* the remaining cases will only exist if the expert item exists so no need to check */
         case ACTYPE_AND_SELECTED:
             if ((!current_filter) || (0 == strlen(current_filter)))
-                g_strlcpy(str, err->procedures[selection].fvalue_value, 256);
+                g_strlcpy(str, err->procedures[selection].fvalue_value, sizeof(str));
             else
-                g_snprintf(str, 255, "(%s) && (%s)", current_filter, err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "(%s) && (%s)", current_filter, err->procedures[selection].fvalue_value);
             break;
         case ACTYPE_OR_SELECTED:
             if ((!current_filter) || (0 == strlen(current_filter)))
-                g_strlcpy(str, err->procedures[selection].fvalue_value, 256);
+                g_strlcpy(str, err->procedures[selection].fvalue_value, sizeof(str));
             else
-                g_snprintf(str, 255, "(%s) || (%s)", current_filter, err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "(%s) || (%s)", current_filter, err->procedures[selection].fvalue_value);
             break;
         case ACTYPE_AND_NOT_SELECTED:
             if ((!current_filter) || (0 == strlen(current_filter)))
-                g_snprintf(str, 255, "!(%s)", err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "!(%s)", err->procedures[selection].fvalue_value);
             else
-                g_snprintf(str, 255, "(%s) && !(%s)", current_filter, err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "(%s) && !(%s)", current_filter, err->procedures[selection].fvalue_value);
             break;
         case ACTYPE_OR_NOT_SELECTED:
             if ((!current_filter) || (0 == strlen(current_filter)))
-                g_snprintf(str, 255, "!(%s)", err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "!(%s)", err->procedures[selection].fvalue_value);
             else
-                g_snprintf(str, 255, "(%s) || !(%s)", current_filter, err->procedures[selection].fvalue_value);
+                g_snprintf(str, sizeof(str), "(%s) || !(%s)", current_filter, err->procedures[selection].fvalue_value);
             break;
         default:
             simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't find menu type - %u", type);
@@ -270,7 +270,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
         break;
     case ACTION_WEB_LOOKUP:
         /* Lookup expert string on internet. Default search via www.google.com */
-        g_snprintf(str, 255, "http://www.google.com/search?hl=en&q=%s+'%s'", err->procedures[selection].entries[1], err->procedures[selection].entries[2]);
+        g_snprintf(str, sizeof(str), "http://www.google.com/search?hl=en&q=%s+'%s'", err->procedures[selection].entries[1], err->procedures[selection].entries[2]);
         browser_open_url(str);
         break;
     default:
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 745b6debe0..c23fa6030a 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -334,14 +334,14 @@ static int flow_graph_tcp_add_to_graph(packet_info *pinfo, const struct tcpheade
     bpos = 1 << i;
     if (tcph->th_flags & bpos) {
       if (flags_found) {
-        g_strlcat(flags, ", ", 64);
+        g_strlcat(flags, ", ", sizeof(flags));
       }
-      g_strlcat(flags, fstr[i], 64);
+      g_strlcat(flags, fstr[i], sizeof(flags));
       flags_found = TRUE;
     }
   }
   if (flags[0] == '\0') {
-    g_snprintf (flags, 64, "<None>");
+    g_snprintf (flags, sizeof(flags), "<None>");
   }
 
   if ((tcph->th_have_seglen)&&(tcph->th_seglen!=0)){
diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index 6b7b6bbf08..a427a16908 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -450,8 +450,8 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t* user_data)
 			end_position
 			);
 
-		g_snprintf(src_port,8,"(%i)", user_data->dlg.items[current_item].port_src);
-		g_snprintf(dst_port,8,"(%i)", user_data->dlg.items[current_item].port_dst);
+		g_snprintf(src_port,sizeof(src_port),"(%i)", user_data->dlg.items[current_item].port_src);
+		g_snprintf(dst_port,sizeof(dst_port),"(%i)", user_data->dlg.items[current_item].port_dst);
 
 		if (start_position<end_position){
 			overwrite(tmp_str,src_port,start_position-9,start_position-1);
diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index dcac637d06..0ddf779ca1 100644
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -130,7 +130,7 @@ static void add_to_clist(mcast_stream_info_t* strinfo)
 	gtk_clist_set_row_data(GTK_CLIST(clist), added_row, strinfo);
 
 	/* Update the top label with the number of detected streams */
-	g_snprintf(label_text, 256,
+	g_snprintf(label_text, sizeof(label_text),
 	        "Detected %d Multicast streams,   Average Bw: %.1f Mbps   Max Bw: %.1f Mbps   Max burst: %d / %dms   Max buffer: %.1f KB",
 	        ++streams_nb, 
 		mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw, 
@@ -138,7 +138,7 @@ static void add_to_clist(mcast_stream_info_t* strinfo)
 		(float)(mcaststream_get_info()->allstreams->element.topbuffusage)/1000);
 	 gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
-	g_snprintf(label_text, 200, "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n", 
+         g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n", 
 		burstint, trigger, bufferalarm, emptyspeed, cumulemptyspeed);
 	gtk_label_set_text(GTK_LABEL(label_par), label_text);
 }
@@ -191,7 +191,7 @@ mcaststream_on_filter                    (GtkButton       *button _U_,
 	if (selected_stream_fwd)
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
-			g_strlcpy(ip_version,"v6",3);
+                    g_strlcpy(ip_version,"v6",sizeof(ip_version));
 		}		
 		else{
 			ip_version[0] = '\0';
@@ -229,7 +229,7 @@ mcaststream_on_select_row(GtkCList *clist,
 	gchar label_text[80];
 
 	selected_stream_fwd = gtk_clist_get_row_data(GTK_CLIST(clist), row);
-	g_snprintf(label_text, 80, "Selected: %s:%u -> %s:%u",
+	g_snprintf(label_text, sizeof(label_text), "Selected: %s:%u -> %s:%u",
 			get_addr_name(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			get_addr_name(&(selected_stream_fwd->dest_addr)),
@@ -424,31 +424,31 @@ mcast_on_params                      (GtkButton       *button _U_,
 	label = gtk_label_new("  Burst measurement interval (ms)  ");
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 	entry1 = gtk_entry_new();
-	g_snprintf(label_text, 50, "%u", burstint);
+	g_snprintf(label_text, sizeof(label_text), "%u", burstint);
 	gtk_entry_set_text(GTK_ENTRY(entry1), label_text);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry1, 1, 2, 0, 1);
 	label = gtk_label_new("  Burst alarm threshold (packets)   ");
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
 	entry2 = gtk_entry_new();
-	g_snprintf(label_text, 50, "%u", trigger);
+	g_snprintf(label_text, sizeof(label_text), "%u", trigger);
 	gtk_entry_set_text(GTK_ENTRY(entry2), label_text);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry2, 1, 2, 1, 2);
 	label = gtk_label_new("  Buffer alarm threshold (bytes)     ");
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
 	entry3 = gtk_entry_new();
-	g_snprintf(label_text, 50, "%u", bufferalarm);
+	g_snprintf(label_text, sizeof(label_text), "%u", bufferalarm);
 	gtk_entry_set_text(GTK_ENTRY(entry3), label_text);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry3, 1, 2, 2, 3);
 	label = gtk_label_new("  Stream empty speed (kbit/s)      ");
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
 	entry4 = gtk_entry_new();
-	g_snprintf(label_text, 50, "%u", emptyspeed);
+	g_snprintf(label_text, sizeof(label_text), "%u", emptyspeed);
 	gtk_entry_set_text(GTK_ENTRY(entry4), label_text);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry4, 1, 2, 3, 4);
 	label = gtk_label_new("  Total empty speed (kbit/s)       ");
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 4, 5);
 	entry5 = gtk_entry_new();
-	g_snprintf(label_text, 50, "%u", cumulemptyspeed);
+	g_snprintf(label_text, sizeof(label_text), "%u", cumulemptyspeed);
 	gtk_entry_set_text(GTK_ENTRY(entry5), label_text);
 	gtk_table_attach_defaults(GTK_TABLE(table), entry5, 1, 2, 4, 5);
 
diff --git a/gtk/megaco_stat.c b/gtk/megaco_stat.c
index e4d60d416f..a2aa9de9b1 100644
--- a/gtk/megaco_stat.c
+++ b/gtk/megaco_stat.c
@@ -105,13 +105,13 @@ megacostat_draw(void *pms)
 			continue;
 		}
 
-		g_snprintf(str[0], 256, "%s", val_to_str(i,megaco_message_type,"Other"));
-		g_snprintf(str[1], 256, "%d", ms->rtd[i].num);
-		g_snprintf(str[2], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
-		g_snprintf(str[3], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
-		g_snprintf(str[4], 256, "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
-		g_snprintf(str[5], 256, "%6u", ms->rtd[i].min_num);
-		g_snprintf(str[6], 256, "%6u", ms->rtd[i].max_num);
+		g_snprintf(str[0], sizeof(char[256]), "%s", val_to_str(i,megaco_message_type,"Other"));
+		g_snprintf(str[1], sizeof(char[256]), "%d", ms->rtd[i].num);
+		g_snprintf(str[2], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
+		g_snprintf(str[3], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
+		g_snprintf(str[4], sizeof(char[256]), "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
+		g_snprintf(str[5], sizeof(char[256]), "%6u", ms->rtd[i].min_num);
+		g_snprintf(str[6], sizeof(char[256]), "%6u", ms->rtd[i].max_num);
 		gtk_clist_append(ms->table, str);
 	}
 
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 910ccd5e26..02183d9d5f 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -205,13 +205,13 @@ mgcpstat_draw(void *pms)
 			continue;
 		}
 
-		g_snprintf(str[0], 256, "%s", val_to_str(i,mgcp_mesage_type,"Other"));
-		g_snprintf(str[1], 256, "%d", ms->rtd[i].num);
-		g_snprintf(str[2], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
-		g_snprintf(str[3], 256, "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
-		g_snprintf(str[4], 256, "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
-		g_snprintf(str[5], 256, "%6u", ms->rtd[i].min_num);
-		g_snprintf(str[6], 256, "%6u", ms->rtd[i].max_num);
+		g_snprintf(str[0], sizeof(char[256]), "%s", val_to_str(i,mgcp_mesage_type,"Other"));
+		g_snprintf(str[1], sizeof(char[256]), "%d", ms->rtd[i].num);
+		g_snprintf(str[2], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].min)));
+		g_snprintf(str[3], sizeof(char[256]), "%8.2f msec", nstime_to_msec(&(ms->rtd[i].max)));
+		g_snprintf(str[4], sizeof(char[256]), "%8.2f msec", get_average(&(ms->rtd[i].tot), ms->rtd[i].num));
+		g_snprintf(str[5], sizeof(char[256]), "%6u", ms->rtd[i].min_num);
+		g_snprintf(str[6], sizeof(char[256]), "%6u", ms->rtd[i].max_num);
 		gtk_clist_append(ms->table, str);
 	}
 
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index f2de2e794b..687aa4a0f8 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -171,15 +171,15 @@ pref_show(pref_t *pref, gpointer user_data)
     switch (pref->info.base) {
 
     case 10:
-      g_snprintf(uint_str, 10+1, "%u", pref->saved_val.uint);
+      g_snprintf(uint_str, sizeof(uint_str), "%u", pref->saved_val.uint);
       break;
 
     case 8:
-      g_snprintf(uint_str, 10+1, "%o", pref->saved_val.uint);
+      g_snprintf(uint_str, sizeof(uint_str), "%o", pref->saved_val.uint);
       break;
 
     case 16:
-      g_snprintf(uint_str, 10+1, "%x", pref->saved_val.uint);
+      g_snprintf(uint_str, sizeof(uint_str), "%x", pref->saved_val.uint);
       break;
     }
     pref->control = create_preference_entry(main_tb, pref->ordinal,
diff --git a/gtk/prefs_gui.c b/gtk/prefs_gui.c
index 054840146a..bf235fd75a 100644
--- a/gtk/prefs_gui.c
+++ b/gtk/prefs_gui.c
@@ -270,7 +270,7 @@ gui_prefs_show(void)
 	/* File Open dialog preview timeout */
 	fileopen_preview_te = create_preference_entry(main_tb, pos++,
 	    "\"File Open\" preview timeout:", "Timeout, until preview gives up scanning the capture file content.", open_file_preview_str);
-	g_snprintf(current_val_str, 128, "%d", prefs.gui_fileopen_preview);
+	g_snprintf(current_val_str, sizeof(current_val_str), "%d", prefs.gui_fileopen_preview);
 	gtk_entry_set_text(GTK_ENTRY(fileopen_preview_te), current_val_str);
 	gtk_tooltips_set_tip(tooltips, fileopen_preview_te, 
         "Reading preview data in the \"File Open\" dialog will be stopped after given seconds.", NULL);
@@ -280,7 +280,7 @@ gui_prefs_show(void)
 	/* Number of recent entries in the display filter list ... */
 	recent_df_entries_max_te = create_preference_entry(main_tb, pos++,
 	    "Filter display max. list entries:", "Maximum number of recent entries in filter display list", recent_df_entries_max_str);
-	g_snprintf(current_val_str, 128, "%d", prefs.gui_recent_df_entries_max);
+	g_snprintf(current_val_str, sizeof(current_val_str), "%d", prefs.gui_recent_df_entries_max);
 	gtk_entry_set_text(GTK_ENTRY(recent_df_entries_max_te), current_val_str);
 	g_object_set_data(G_OBJECT(main_vb), GUI_RECENT_DF_ENTRIES_KEY, recent_df_entries_max_te);
 	g_signal_connect(recent_df_entries_max_te, "focus_out_event", G_CALLBACK(recent_df_entries_changed_cb), main_vb);
@@ -288,7 +288,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);
-	g_snprintf(current_val_str, 128, "%d", prefs.gui_recent_files_count_max);
+	g_snprintf(current_val_str, sizeof(current_val_str), "%d", prefs.gui_recent_files_count_max);
 	gtk_entry_set_text(GTK_ENTRY(recent_files_count_max_te), current_val_str);
 	gtk_tooltips_set_tip(tooltips, recent_files_count_max_te, 
         "Maximum number of entries in the \"File/Open Recent\" list.", NULL);
diff --git a/gtk/prefs_nameres.c b/gtk/prefs_nameres.c
index 4b53462e98..7131c08d00 100644
--- a/gtk/prefs_nameres.c
+++ b/gtk/prefs_nameres.c
@@ -162,7 +162,7 @@ nameres_prefs_show(void)
 
 	/* Max concurrent requests */
 	table_row++;
-	g_snprintf(concur_str, 10+1, "%d", prefs.name_resolve_concurrency);
+	g_snprintf(concur_str, sizeof(concur_str), "%d", prefs.name_resolve_concurrency);
 	resolv_concurrency_te = create_preference_entry(main_tb, table_row,
 	    "Maximum concurrent requests:", "maximum parallel running DNS requests", concur_str);
 	g_object_set_data(G_OBJECT(main_vb), RESOLVE_CONCURRENCY_KEY, resolv_concurrency_te);
diff --git a/gtk/prefs_taps.c b/gtk/prefs_taps.c
index 2a3e6f751c..0b950af383 100644
--- a/gtk/prefs_taps.c
+++ b/gtk/prefs_taps.c
@@ -72,7 +72,7 @@ stats_prefs_show(void)
         tap_update_interval_te = create_preference_entry(main_tb, pos++,
             "Tap update interval in ms:", 
             "Determines time between tap updates.", max_visible_str);
-        g_snprintf(update_interval_str, 128, "%d", prefs.tap_update_interval);
+        g_snprintf(update_interval_str, sizeof(update_interval_str), "%d", prefs.tap_update_interval);
         gtk_entry_set_text(GTK_ENTRY(tap_update_interval_te), update_interval_str);
         gtk_tooltips_set_tip(tooltips, tap_update_interval_te,
             "Gap in milliseconds between updates to taps is defined here", NULL);
@@ -83,7 +83,7 @@ stats_prefs_show(void)
         rtp_player_max_visible_te = create_preference_entry(main_tb, pos++,
             "Max visible channels in RTP Player:", 
             "Determines maximum height of RTP Player window.", max_visible_str);
-        g_snprintf(max_visible_str, 128, "%d", prefs.rtp_player_max_visible);
+        g_snprintf(max_visible_str, sizeof(max_visible_str), "%d", prefs.rtp_player_max_visible);
         gtk_entry_set_text(GTK_ENTRY(rtp_player_max_visible_te), max_visible_str);
         gtk_tooltips_set_tip(tooltips, rtp_player_max_visible_te,
             "Maximum height of RTP Player window is defined here.", NULL);
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index eac2dfefe0..7f5aaaee30 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.c
@@ -372,7 +372,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];
-		g_snprintf(vs, 5, "%d",i);
+		g_snprintf(vs, sizeof(vs), "%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
 		g_signal_connect(menu_item, "activate", G_CALLBACK(rpcstat_version_select),
                                (gpointer)(long) i);
@@ -473,7 +473,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];
-		g_snprintf(vs, 5, "%d",i);
+		g_snprintf(vs, sizeof(vs), "%d",i);
 		menu_item=gtk_menu_item_new_with_label(vs);
 		g_signal_connect(menu_item, "activate", G_CALLBACK(rpcstat_version_select),
                                (gpointer)(long) i);
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index 2ea2aa4cda..58c17a174f 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -832,14 +832,14 @@ static void on_graph_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_)
 	user_data->series_rev.color.blue = 0xffff;
 	user_data->series_rev.yvalue = -0.5;
 
-	g_snprintf(title1, 80, "Forward: %s:%u to %s:%u (SSRC=0x%X)",
+	g_snprintf(title1, sizeof(title1), "Forward: %s:%u to %s:%u (SSRC=0x%X)",
 		get_addr_name(&(user_data->ip_src_fwd)),
 		user_data->port_src_fwd,
 		get_addr_name(&(user_data->ip_dst_fwd)),
 		user_data->port_dst_fwd,
 		user_data->ssrc_fwd);
 
-	g_snprintf(title2, 80, "Reverse: %s:%u to %s:%u (SSRC=0x%X)",
+	g_snprintf(title2, sizeof(title2), "Reverse: %s:%u to %s:%u (SSRC=0x%X)",
 		get_addr_name(&(user_data->ip_src_rev)),
 		user_data->port_src_rev,
 		get_addr_name(&(user_data->ip_dst_rev)),
@@ -898,22 +898,26 @@ static void dialog_graph_reset(user_data_t* user_data)
 	for(i=0;i<MAX_GRAPHS;i++){
 		/* it is forward */
 		if (i<2){
-       			g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=0x%X)",
-					graph_descr[i],
-                	get_addr_name(&(user_data->ip_src_fwd)),
-                	user_data->port_src_fwd,
-                	get_addr_name(&(user_data->ip_dst_fwd)),
-                	user_data->port_dst_fwd,
-                	user_data->ssrc_fwd);
+			g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 
+				   sizeof(user_data->dlg.dialog_graph.graph[0].title),
+				   "%s: %s:%u to %s:%u (SSRC=0x%X)",
+				   graph_descr[i],
+				   get_addr_name(&(user_data->ip_src_fwd)),
+				   user_data->port_src_fwd,
+				   get_addr_name(&(user_data->ip_dst_fwd)),
+				   user_data->port_dst_fwd,
+				   user_data->ssrc_fwd);
 		/* it is reverse */
 		} else {
-			g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=0x%X)",
-					graph_descr[i],
-                	get_addr_name(&(user_data->ip_src_rev)),
-                	user_data->port_src_rev,
-                	get_addr_name(&(user_data->ip_dst_rev)),
-                	user_data->port_dst_rev,
-                	user_data->ssrc_rev);
+			g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 
+				   sizeof(user_data->dlg.dialog_graph.graph[0].title),
+				   "%s: %s:%u to %s:%u (SSRC=0x%X)",
+				   graph_descr[i],
+				   get_addr_name(&(user_data->ip_src_rev)),
+				   user_data->port_src_rev,
+				   get_addr_name(&(user_data->ip_dst_rev)),
+				   user_data->port_dst_rev,
+				   user_data->ssrc_rev);
 		}
 	}
 
@@ -1041,7 +1045,7 @@ static void dialog_graph_draw(user_data_t* user_data)
          * on the width of the text labels. For simplicity we assume that the
          * top y scale label will be the widest one
          */
-         print_time_scale_string(label_string, 15, max_y);
+	print_time_scale_string(label_string, sizeof(label_string), max_y);
         layout = gtk_widget_create_pango_layout(user_data->dlg.dialog_graph.draw_area, label_string);
         pango_layout_get_pixel_size(layout, &label_width, &label_height);
         left_x_border=10;
@@ -1082,7 +1086,7 @@ static void dialog_graph_draw(user_data_t* user_data)
                         user_data->dlg.dialog_graph.pixmap_height-bottom_y_border-draw_height*i/10);
                 /* draw the labels */
                 if(i==0){
-                        print_time_scale_string(label_string, 15, (max_y*i/10));
+                        print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
                         pango_layout_set_text(layout, label_string, -1);
                         pango_layout_get_pixel_size(layout, &lwidth, NULL);
                         gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1092,7 +1096,7 @@ static void dialog_graph_draw(user_data_t* user_data)
                                         layout);
                 }
                 if(i==5){
-                        print_time_scale_string(label_string, 15, (max_y*i/10));
+                        print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
                         pango_layout_set_text(layout, label_string, -1);
                         pango_layout_get_pixel_size(layout, &lwidth, NULL);
                         gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1102,7 +1106,7 @@ static void dialog_graph_draw(user_data_t* user_data)
                                         layout);
                 }
                 if(i==10){
-                        print_time_scale_string(label_string, 15, (max_y*i/10));
+                        print_time_scale_string(label_string, sizeof(label_string), (max_y*i/10));
                         pango_layout_set_text(layout, label_string, -1);
                         pango_layout_get_pixel_size(layout, &lwidth, NULL);
                         gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1175,13 +1179,13 @@ static void dialog_graph_draw(user_data_t* user_data)
                 if(xlen==17){
                         int lwidth;
                         if(user_data->dlg.dialog_graph.interval>=1000){
-                                g_snprintf(label_string, 15, "%ds", current_interval/1000);
+                                g_snprintf(label_string, sizeof(label_string), "%ds", current_interval/1000);
                         } else if(user_data->dlg.dialog_graph.interval>=100){
-                                g_snprintf(label_string, 15, "%d.%1ds", current_interval/1000,(current_interval/100)%10);
+                                g_snprintf(label_string, sizeof(label_string), "%d.%1ds", current_interval/1000,(current_interval/100)%10);
                         } else if(user_data->dlg.dialog_graph.interval>=10){
-                                g_snprintf(label_string, 15, "%d.%2ds", current_interval/1000,(current_interval/10)%100);
+                                g_snprintf(label_string, sizeof(label_string), "%d.%2ds", current_interval/1000,(current_interval/10)%100);
                         } else {
-                                g_snprintf(label_string, 15, "%d.%3ds", current_interval/1000,current_interval%1000);
+                                g_snprintf(label_string, sizeof(label_string), "%d.%3ds", current_interval/1000,current_interval%1000);
                         }
                         pango_layout_set_text(layout, label_string, -1);
                         pango_layout_get_pixel_size(layout, &lwidth, NULL);
@@ -1203,7 +1207,7 @@ static void dialog_graph_draw(user_data_t* user_data)
          * Draw "x" for Sequence Errors and "m" for Marks
          */
 	/* Draw the labels Fwd and Rev */
-	g_strlcpy(label_string,"<-Fwd",15);
+	g_strlcpy(label_string,"<-Fwd",sizeof(label_string));
 	pango_layout_set_text(layout, label_string, -1);
 	pango_layout_get_pixel_size(layout, &lwidth, NULL);
 	gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1211,7 +1215,7 @@ static void dialog_graph_draw(user_data_t* user_data)
 		user_data->dlg.dialog_graph.pixmap_width-right_x_border+33-lwidth,
 		user_data->dlg.dialog_graph.pixmap_height-bottom_y_border+3,
 		layout);
-        g_strlcpy(label_string,"<-Rev",15);
+        g_strlcpy(label_string,"<-Rev",sizeof(label_string));
         pango_layout_set_text(layout, label_string, -1);
         pango_layout_get_pixel_size(layout, &lwidth, NULL);
         gdk_draw_layout(user_data->dlg.dialog_graph.pixmap,
@@ -1238,9 +1242,9 @@ static void dialog_graph_draw(user_data_t* user_data)
 			if(user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & (STAT_FLAG_WRONG_SEQ|STAT_FLAG_MARKER)){
 				int lwidth;
 				if (user_data->dlg.dialog_graph.graph[i].items[interval/user_data->dlg.dialog_graph.interval].flags & STAT_FLAG_WRONG_SEQ){
-					g_strlcpy(label_string,"x",15);
+					g_strlcpy(label_string,"x",sizeof(label_string));
 				} else {
-					g_strlcpy(label_string,"m",15);
+					g_strlcpy(label_string,"m",sizeof(label_string));
 				}
 
                            	pango_layout_set_text(layout, label_string, -1);
@@ -1489,7 +1493,7 @@ static void create_filter_box(dialog_graph_graph_t *dgg, GtkWidget *box, int num
         gtk_box_set_child_packing(GTK_BOX(box), hbox, FALSE, FALSE, 0, GTK_PACK_START);
         gtk_widget_show(hbox);
 
-	g_snprintf(str, 256, "Graph %d", num);
+	g_snprintf(str, sizeof(str), "Graph %d", num);
 	dgg->display_button=gtk_toggle_button_new_with_label(str);
         gtk_box_pack_start(GTK_BOX(hbox), dgg->display_button, FALSE, FALSE, 0);
         gtk_widget_show(dgg->display_button);
@@ -1586,9 +1590,9 @@ static void create_yscale_max_menu_items(user_data_t* user_data, GtkWidget *menu
 
         for(i=0;i<MAX_YSCALE;i++){
                 if(yscale_max[i]==AUTO_MAX_YSCALE){
-			g_strlcpy(str,"Auto",15);
+			g_strlcpy(str,"Auto",sizeof(str));
                 } else {
-                        g_snprintf(str, 15, "%u ms", yscale_max[i]/1000);
+                        g_snprintf(str, sizeof(str), "%u ms", yscale_max[i]/1000);
                 }
                 menu_item=gtk_menu_item_new_with_label(str);
                 g_object_set_data(G_OBJECT(menu_item), "yscale_max",
@@ -1608,7 +1612,7 @@ static void create_pixels_per_tick_menu_items(user_data_t* user_data, GtkWidget
         int i;
 
         for(i=0;i<MAX_PIXELS_PER_TICK;i++){
-                g_snprintf(str, 5, "%u", pixels_per_tick[i]);
+                g_snprintf(str, sizeof(str), "%u", pixels_per_tick[i]);
                 menu_item=gtk_menu_item_new_with_label(str);
 
                 g_object_set_data(G_OBJECT(menu_item), "pixels_per_tick",
@@ -1631,13 +1635,13 @@ static void create_tick_interval_menu_items(user_data_t* user_data, GtkWidget *m
 
         for(i=0;i<MAX_TICK_VALUES;i++){
                 if(tick_interval_values[i]>=1000){
-                        g_snprintf(str, 15, "%u sec", tick_interval_values[i]/1000);
+                        g_snprintf(str, sizeof(str), "%u sec", tick_interval_values[i]/1000);
                 } else if(tick_interval_values[i]>=100){
-                        g_snprintf(str, 15, "0.%1u sec", (tick_interval_values[i]/100)%10);
+                        g_snprintf(str, sizeof(str), "0.%1u sec", (tick_interval_values[i]/100)%10);
                 } else if(tick_interval_values[i]>=10){
-                        g_snprintf(str, 15, "0.%02u sec", (tick_interval_values[i]/10)%10);
+                        g_snprintf(str, sizeof(str), "0.%02u sec", (tick_interval_values[i]/10)%10);
                 } else {
-                        g_snprintf(str, 15, "0.%03u sec", (tick_interval_values[i])%10);
+                        g_snprintf(str, sizeof(str), "0.%03u sec", (tick_interval_values[i])%10);
                 }
 
                 menu_item=gtk_menu_item_new_with_label(str);
@@ -2820,7 +2824,7 @@ static void draw_stat(user_data_t *user_data)
                 r_perc = 0;
         }
 
-	g_snprintf(label_max, 199, "Max delta = %f sec at packet no. %u \n"
+	g_snprintf(label_max, sizeof(label_max), "Max delta = %f sec at packet no. %u \n"
 		"Total RTP packets = %u   (expected %u)   Lost RTP packets = %d (%.2f%%)"
 		"   Sequence errors = %u",
 		user_data->forward.statinfo.max_delta, user_data->forward.statinfo.max_nr,
@@ -2829,7 +2833,7 @@ static void draw_stat(user_data_t *user_data)
 
 	gtk_label_set_text(GTK_LABEL(user_data->dlg.label_stats_fwd), label_max);
 
-	g_snprintf(label_max, 199, "Max delta = %f sec at packet no. %u \n"
+	g_snprintf(label_max, sizeof(label_max), "Max delta = %f sec at packet no. %u \n"
 		"Total RTP packets = %u   (expected %u)   Lost RTP packets = %d (%.2f%%)"
 		"   Sequence errors = %u",
 		user_data->reversed.statinfo.max_delta, user_data->reversed.statinfo.max_nr,
@@ -3126,22 +3130,22 @@ static void create_rtp_dialog(user_data_t* user_data)
 	gtk_widget_show(main_vb);
 
 	/* Notebooks... */
-	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_fwd)), 16);
-	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_fwd)), 16);
+	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_fwd)), sizeof(str_ip_src));
+	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_fwd)), sizeof(str_ip_dst));
 
-	g_snprintf(label_forward, 149,
+	g_snprintf(label_forward, sizeof(label_forward),
 		"Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
 		str_ip_src, user_data->port_src_fwd, str_ip_dst, user_data->port_dst_fwd, user_data->ssrc_fwd);
 
-	g_snprintf(label_forward_tree, 149,
+	g_snprintf(label_forward_tree, sizeof(label_forward_tree),
 		"Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
 		str_ip_src, user_data->port_src_fwd, str_ip_dst, user_data->port_dst_fwd, user_data->ssrc_fwd);
 
 
-	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_rev)), 16);
-	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_rev)), 16);
+	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_rev)), sizeof(str_ip_src));
+	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_rev)), sizeof(str_ip_dst));
 
-	g_snprintf(label_reverse, 149,
+	g_snprintf(label_reverse, sizeof(label_reverse),
 		"Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
 		str_ip_src, user_data->port_src_rev, str_ip_dst, user_data->port_dst_rev, user_data->ssrc_rev);
 
@@ -3477,7 +3481,7 @@ static void rtp_analysis_cb(GtkWidget *w _U_, gpointer data _U_)
 	guint nfound;
 
 	/* Try to compile the filter. */
-	g_strlcpy(filter_text,"rtp && rtp.version && rtp.ssrc && (ip || ipv6)",256);
+	g_strlcpy(filter_text,"rtp && rtp.version && rtp.ssrc && (ip || ipv6)",sizeof(filter_text));
 	if (!dfilter_compile(filter_text, &sfcode)) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg);
 		return;
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 4b78fc0e3a..87b713dda5 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -141,7 +141,7 @@ static void add_to_clist(rtp_stream_info_t* strinfo)
 	gtk_clist_set_row_data(GTK_CLIST(clist), added_row, strinfo);
 
 	/* Update the top label with the number of detected streams */
-	g_snprintf(label_text, 256,
+	g_snprintf(label_text, sizeof(label_text),
 	        "Detected %d RTP streams. Choose one for forward and reverse direction for analysis",
 	        ++streams_nb);
 	 gtk_label_set_text(GTK_LABEL(top_label), label_text);
@@ -367,7 +367,7 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	if (selected_stream_fwd)
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
-			g_strlcpy(ip_version,"v6",3);
+			g_strlcpy(ip_version,"v6",sizeof(ip_version));
 		}		
 		else{
 			ip_version[0] = '\0';
@@ -387,7 +387,7 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	if (selected_stream_rev)
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
-			g_strlcpy(ip_version,"v6",3);
+			g_strlcpy(ip_version,"v6",sizeof(ip_version));
 		}		
 		else{
 			ip_version[0] = '\0';
@@ -527,7 +527,7 @@ rtpstream_on_select_row(GtkCList *clist,
 	/* update the labels */
 	if (event==NULL || event->state & GDK_SHIFT_MASK) {
 		selected_stream_rev = gtk_clist_get_row_data(GTK_CLIST(clist), row);
-		g_snprintf(label_text, 80, "Reverse: %s:%u -> %s:%u, SSRC=0x%X",
+		g_snprintf(label_text, sizeof(label_text), "Reverse: %s:%u -> %s:%u, SSRC=0x%X",
 			get_addr_name(&(selected_stream_rev->src_addr)),
 			selected_stream_rev->src_port,
 			get_addr_name(&(selected_stream_rev->dest_addr)),
@@ -538,7 +538,7 @@ rtpstream_on_select_row(GtkCList *clist,
 	}
 	else {
 		selected_stream_fwd = gtk_clist_get_row_data(GTK_CLIST(clist), row);
-		g_snprintf(label_text, 80, "Forward: %s:%u -> %s:%u, SSRC=0x%X",
+		g_snprintf(label_text, sizeof(label_text), "Forward: %s:%u -> %s:%u, SSRC=0x%X",
 			get_addr_name(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			get_addr_name(&(selected_stream_fwd->dest_addr)),
diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 226e65513e..e874e1411d 100644
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.c
@@ -208,25 +208,25 @@ update_analyse_dlg(struct sctp_analyse* u_data)
 	}
 
 
-	g_snprintf(label_txt, 50,"Checksum Type: %s",u_data->assoc->checksum_type);
+	g_snprintf(label_txt, sizeof(label_txt),"Checksum Type: %s",u_data->assoc->checksum_type);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->checktype), label_txt);
-	g_snprintf(label_txt, 50,"Checksum Errors: %u",u_data->assoc->n_checksum_errors);
+	g_snprintf(label_txt, sizeof(label_txt),"Checksum Errors: %u",u_data->assoc->n_checksum_errors);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->checksum), label_txt);
-	g_snprintf(label_txt, 50,"Bundling Errors: %u",u_data->assoc->n_bundling_errors);
+	g_snprintf(label_txt, sizeof(label_txt),"Bundling Errors: %u",u_data->assoc->n_bundling_errors);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->bundling), label_txt);
-	g_snprintf(label_txt, 50,"Padding Errors: %u",u_data->assoc->n_padding_errors);
+	g_snprintf(label_txt, sizeof(label_txt),"Padding Errors: %u",u_data->assoc->n_padding_errors);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->padding), label_txt);
-	g_snprintf(label_txt, 50,"Length Errors: %u",u_data->assoc->n_length_errors);
+	g_snprintf(label_txt, sizeof(label_txt),"Length Errors: %u",u_data->assoc->n_length_errors);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->length), label_txt);
-	g_snprintf(label_txt, 50,"Value Errors: %u",u_data->assoc->n_value_errors);
+	g_snprintf(label_txt, sizeof(label_txt),"Value Errors: %u",u_data->assoc->n_value_errors);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->value), label_txt);
-	g_snprintf(label_txt, 50,"No of Data Chunks from EP1 to EP2: %u",u_data->assoc->n_data_chunks_ep1);
+	g_snprintf(label_txt, sizeof(label_txt),"No of Data Chunks from EP1 to EP2: %u",u_data->assoc->n_data_chunks_ep1);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->chunks_ep1), label_txt);
-	g_snprintf(label_txt, 50,"No of Data Bytes from EP1 to EP2: %u",u_data->assoc->n_data_bytes_ep1);
+	g_snprintf(label_txt, sizeof(label_txt),"No of Data Bytes from EP1 to EP2: %u",u_data->assoc->n_data_bytes_ep1);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->bytes_ep1), label_txt);
-	g_snprintf(label_txt, 50,"No of Data Chunks from EP2 to EP1: %u",u_data->assoc->n_data_chunks_ep2);
+	g_snprintf(label_txt, sizeof(label_txt),"No of Data Chunks from EP2 to EP1: %u",u_data->assoc->n_data_chunks_ep2);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->chunks_ep2), label_txt);
-	g_snprintf(label_txt, 50,"No of Data Bytes from EP2 to EP1: %u",u_data->assoc->n_data_bytes_ep2);
+	g_snprintf(label_txt, sizeof(label_txt),"No of Data Bytes from EP2 to EP1: %u",u_data->assoc->n_data_bytes_ep2);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->bytes_ep2), label_txt);
 
 	if (u_data->assoc->init == TRUE)
@@ -262,28 +262,28 @@ update_analyse_dlg(struct sctp_analyse* u_data)
 	{
 		return;
 	}
-	g_snprintf(label_txt, 50,"Port: %u",u_data->assoc->port1);
+	g_snprintf(label_txt, sizeof(label_txt),"Port: %u",u_data->assoc->port1);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->port), label_txt);
-	g_snprintf(label_txt, 50,"Sent Verification Tag: 0x%x",u_data->assoc->verification_tag1);
+	g_snprintf(label_txt, sizeof(label_txt),"Sent Verification Tag: 0x%x",u_data->assoc->verification_tag1);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->veritag), label_txt);
 
 	if (u_data->assoc->init == TRUE || (u_data->assoc->initack == TRUE && u_data->assoc->initack_dir == 1))
 	{
-		g_snprintf(label_txt, 50,"Requested Number of Inbound Streams: %u",u_data->assoc->instream1);
+		g_snprintf(label_txt, sizeof(label_txt),"Requested Number of Inbound Streams: %u",u_data->assoc->instream1);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->max_in), label_txt);
-		g_snprintf(label_txt, 50,"Minimum Number of Inbound Streams: %u",((u_data->assoc->instream1>u_data->assoc->outstream2)?u_data->assoc->outstream2:u_data->assoc->instream1));
+		g_snprintf(label_txt, sizeof(label_txt),"Minimum Number of Inbound Streams: %u",((u_data->assoc->instream1>u_data->assoc->outstream2)?u_data->assoc->outstream2:u_data->assoc->instream1));
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->min_in), label_txt);
 
-		g_snprintf(label_txt, 50,"Provided Number of Outbound Streams: %u",u_data->assoc->outstream1);
+		g_snprintf(label_txt, sizeof(label_txt),"Provided Number of Outbound Streams: %u",u_data->assoc->outstream1);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->max_out), label_txt);
-		g_snprintf(label_txt, 50,"Minimum Number of Outbound Streams: %u",((u_data->assoc->outstream1>u_data->assoc->instream2)?u_data->assoc->instream2:u_data->assoc->outstream1));
+		g_snprintf(label_txt, sizeof(label_txt),"Minimum Number of Outbound Streams: %u",((u_data->assoc->outstream1>u_data->assoc->instream2)?u_data->assoc->instream2:u_data->assoc->outstream1));
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->max_out), label_txt);
 	}
 	else
 	{
-		g_snprintf(label_txt, 50,"Used Number of Inbound Streams: %u",u_data->assoc->instream1);
+		g_snprintf(label_txt, sizeof(label_txt),"Used Number of Inbound Streams: %u",u_data->assoc->instream1);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->max_in), label_txt);
-		g_snprintf(label_txt, 50,"Used Number of Outbound Streams: %u",u_data->assoc->outstream1);
+		g_snprintf(label_txt, sizeof(label_txt),"Used Number of Outbound Streams: %u",u_data->assoc->outstream1);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page2->max_out), label_txt);
 	}
 
@@ -320,28 +320,28 @@ update_analyse_dlg(struct sctp_analyse* u_data)
 		return;
 	}
 
-	g_snprintf(label_txt, 50,"Port: %u",u_data->assoc->port2);
+	g_snprintf(label_txt, sizeof(label_txt),"Port: %u",u_data->assoc->port2);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->port), label_txt);
-	g_snprintf(label_txt, 50,"Sent Verification Tag: 0x%x",u_data->assoc->verification_tag2);
+	g_snprintf(label_txt, sizeof(label_txt),"Sent Verification Tag: 0x%x",u_data->assoc->verification_tag2);
 	gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->veritag), label_txt);
 
 	if (u_data->assoc->initack == TRUE)
 	{
-		g_snprintf(label_txt, 50,"Requested Number of Inbound Streams: %u",u_data->assoc->instream2);
+		g_snprintf(label_txt, sizeof(label_txt),"Requested Number of Inbound Streams: %u",u_data->assoc->instream2);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->max_in), label_txt);
-		g_snprintf(label_txt, 50,"Minimum Number of Inbound Streams: %u",((u_data->assoc->instream2>u_data->assoc->outstream1)?u_data->assoc->outstream1:u_data->assoc->instream2));
+		g_snprintf(label_txt, sizeof(label_txt),"Minimum Number of Inbound Streams: %u",((u_data->assoc->instream2>u_data->assoc->outstream1)?u_data->assoc->outstream1:u_data->assoc->instream2));
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->min_in), label_txt);
 
-		g_snprintf(label_txt, 50,"Provided Number of Outbound Streams: %u",u_data->assoc->outstream2);
+		g_snprintf(label_txt, sizeof(label_txt),"Provided Number of Outbound Streams: %u",u_data->assoc->outstream2);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->max_out), label_txt);
-		g_snprintf(label_txt, 50,"Minimum Number of Outbound Streams: %u",((u_data->assoc->outstream2>u_data->assoc->instream1)?u_data->assoc->instream1:u_data->assoc->outstream2));
+		g_snprintf(label_txt, sizeof(label_txt),"Minimum Number of Outbound Streams: %u",((u_data->assoc->outstream2>u_data->assoc->instream1)?u_data->assoc->instream1:u_data->assoc->outstream2));
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->min_out), label_txt);
 	}
 	else
 	{
-		g_snprintf(label_txt, 50,"Used Number of Inbound Streams: %u",u_data->assoc->instream2);
+		g_snprintf(label_txt, sizeof(label_txt),"Used Number of Inbound Streams: %u",u_data->assoc->instream2);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->max_in), label_txt);
-		g_snprintf(label_txt, 50,"Used Number of Outbound Streams: %u",u_data->assoc->outstream2);
+		g_snprintf(label_txt, sizeof(label_txt),"Used Number of Outbound Streams: %u",u_data->assoc->outstream2);
 		gtk_label_set_text(GTK_LABEL(u_data->analyse_nb->page3->min_out), label_txt);
 	}
 }
diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index e47d6caa53..9445a093fc 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -359,7 +359,7 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 	else
 		distance = 5;
 
-	g_snprintf(label_string, 15, "%d", 0);
+	g_snprintf(label_string, sizeof(label_string), "%d", 0);
 	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
 	layout = gtk_widget_create_pango_layout(u_data->io->draw_area, label_string);
 	pango_layout_get_pixel_size(layout, &label_width, &label_height);
@@ -371,8 +371,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 
 	if (u_data->io->offset != 0)
 	{
-		g_snprintf(label_string, 15, "%u", u_data->io->x1_tmp_sec);
-		memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+		g_snprintf(label_string, sizeof(label_string), "%u", u_data->io->x1_tmp_sec);
+		memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 		pango_layout_set_text(layout, label_string, -1);
 		pango_layout_get_pixel_size(layout, &lwidth, NULL);
 
@@ -428,13 +428,13 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		if (i >= u_data->io->min_x && i % 1000000 != 0)
 		{
 			length = 5;
-			g_snprintf(label_string, 15, "%d", i%1000000);
+			g_snprintf(label_string, sizeof(label_string), "%d", i%1000000);
 
 			if (j % w == 0)
 			{
 				length = 10;
 
-				memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+				memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 				pango_layout_set_text(layout, label_string, -1);
 				pango_layout_get_pixel_size(layout, &lwidth, NULL);
 				gdk_draw_layout(u_data->io->pixmap,
@@ -475,8 +475,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			              (guint32)(LEFT_BORDER + u_data->io->offset + (i - u_data->io->min_x) * u_data->io->x_interval),
 			              u_data->io->pixmap_height - BOTTOM_BORDER + 10);
 
-			g_snprintf(label_string, 15, "%d", sec);
-			memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+			g_snprintf(label_string, sizeof(label_string), "%d", sec);
+			memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 			pango_layout_set_text(layout, label_string, -1);
 			pango_layout_get_pixel_size(layout, &lwidth, NULL);
 			gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
@@ -487,9 +487,9 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		}
 	}
 
-	g_strlcpy(label_string, "sec", 15);
+	g_strlcpy(label_string, "sec", sizeof(label_string));
 
-	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 	pango_layout_set_text(layout, label_string, -1);
 	pango_layout_get_pixel_size(layout, &lwidth, NULL);
 	gdk_draw_layout(u_data->io->pixmap,
@@ -543,13 +543,13 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			if (i >= u_data->io->min_y)
 			{
 				length = 5;
-				g_snprintf(label_string, 15, "%d", i);
+				g_snprintf(label_string, sizeof(label_string), "%d", i);
 
 				if (i%distance == 0 || (distance <= 5 && u_data->io->y_interval > 10))
 				{
 					length = 10;
 
-					memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+					memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 					pango_layout_set_text(layout, label_string, -1);
 					pango_layout_get_pixel_size(layout, &lwidth, NULL);
 					gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
@@ -999,7 +999,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 				}
 			}
 			cf_goto_frame(&cfile, tmptsn->frame_number);
-			g_snprintf(label_string, 30, "(%.6f, %u)", x_value, y_value);
+			g_snprintf(label_string, sizeof(label_string), "(%.6f, %u)", x_value, y_value);
 			label_set = TRUE;
 
 			gdk_draw_line(u_data->io->pixmap,text_color, (gint)(event->x-2), (gint)(event->y), (gint)(event->x+2), (gint)(event->y));
diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 3c5410e683..e30ef8cb14 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -415,8 +415,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 	else
 		distance=5;
 
-	g_snprintf(label_string, 15, "%d", 0);
-	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+	g_snprintf(label_string, sizeof(label_string), "%d", 0);
+	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 	layout = gtk_widget_create_pango_layout(u_data->io->draw_area, label_string);
 	pango_layout_get_pixel_size(layout, &label_width, &label_height);
 
@@ -428,9 +428,9 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 
 	if (u_data->io->offset!=0)
 	{
-		g_snprintf(label_string, 15, "%u", u_data->io->x1_tmp_sec);
+		g_snprintf(label_string, sizeof(label_string), "%u", u_data->io->x1_tmp_sec);
 
-		memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+		memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 		pango_layout_set_text(layout, label_string, -1);
 		pango_layout_get_pixel_size(layout, &lwidth, NULL);
 
@@ -490,11 +490,11 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		if (i>=u_data->io->min_x && i%1000000!=0)
 		{
 			length=5;
-			g_snprintf(label_string, 15, "%d", i%1000000);
+			g_snprintf(label_string, sizeof(label_string), "%d", i%1000000);
 			if (j%w==0)
 			{
 				length=10;
-				memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+				memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 				pango_layout_set_text(layout, label_string, -1);
 				pango_layout_get_pixel_size(layout, &lwidth, NULL);
 				gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
@@ -533,8 +533,8 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			              (guint32)(LEFT_BORDER+u_data->io->offset+(i-u_data->io->min_x)*u_data->io->x_interval),
 			              u_data->io->pixmap_height-BOTTOM_BORDER+10);
 
-			g_snprintf(label_string, 15, "%d", sec);
-			memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+			g_snprintf(label_string, sizeof(label_string), "%d", sec);
+			memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 			pango_layout_set_text(layout, label_string, -1);
 			pango_layout_get_pixel_size(layout, &lwidth, NULL);
 
@@ -547,9 +547,9 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 		
 	}
 
-	g_strlcpy(label_string, "sec", 15);
+	g_strlcpy(label_string, "sec", sizeof(label_string));
 
-	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+	memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 	pango_layout_set_text(layout, label_string, -1);
 	pango_layout_get_pixel_size(layout, &lwidth, NULL);
 	gdk_draw_layout(u_data->io->pixmap,
@@ -590,12 +590,12 @@ static void sctp_graph_draw(struct sctp_udata *u_data)
 			if (i>=u_data->io->min_y)
 			{
 				length=5;
-				g_snprintf(label_string, 15, "%d", i);
+				g_snprintf(label_string, sizeof(label_string), "%d", i);
 				if (i%distance==0 || (distance<=5 && u_data->io->y_interval>10))
 				{
 					length=10;
 
-					memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), 15);
+					memcpy(label_string,(gchar *)g_locale_to_utf8(label_string, -1 , NULL, NULL, NULL), sizeof(label_string));
 					pango_layout_set_text(layout, label_string, -1);
 					pango_layout_get_pixel_size(layout, &lwidth, NULL);
 					gdk_draw_layout(u_data->io->pixmap,u_data->io->draw_area->style->black_gc,
@@ -1070,7 +1070,7 @@ on_button_release (GtkWidget *widget _U_, GdkEventButton *event, struct sctp_uda
 				}
 			}
 
-			g_snprintf(label_string, 30, "(%.6lf, %u)", x_value, y_value);
+			g_snprintf(label_string, sizeof(label_string), "(%.6lf, %u)", x_value, y_value);
 
 			label_set = TRUE;
 
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index 80667dea0c..e664cbf632 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -562,7 +562,7 @@ static void create_text_widget (struct graph *g)
 }
 static void display_text (struct graph *g)
 {
-	char *line[256];
+	char line[256];
 	struct segment *ptr;
 	double first_time, prev_time;
 	unsigned int isn_this=0, isn_opposite=0, seq_this_prev, seq_opposite_prev;
@@ -578,11 +578,10 @@ static void display_text (struct graph *g)
 		simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
 		    "Could not parse color SlateGray.");
 	}
-	g_snprintf ((char * )line, 256, "%10s%15s%15s%15s%15s%15s%15s%10s\n",
+	g_snprintf (line, sizeof(line), "%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,
-							(const char *)line, -1);
+	gtk_text_insert (GTK_TEXT (g->text), g->font, NULL, NULL, line, -1);
 
 	first_time = g->segments->rel_secs + g->segments->rel_usecs/1000000.0;
 	prev_time = first_time;
@@ -617,11 +616,11 @@ static void display_text (struct graph *g)
 			seq_opposite_prev = seq;
 			c = &color;
 		}
-		g_snprintf ((char *)line, 256, "%10d%15.6f%15.6f%15.6f%15u%15d%15d%10u\n",
+		g_snprintf (line, sizeof(line), "%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,
 						ptr->th_seglen);
-                gtk_text_buffer_insert(buf, &iter, (const char *)line, -1);
+                gtk_text_buffer_insert(buf, &iter, line, -1);
 		prev_time = time;
 	}
 }
@@ -1176,9 +1175,9 @@ static void update_zoom_spins (struct graph *g)
 {
 	char s[32];
 
-	g_snprintf (s, 32, "%.3f", g->zoom.x / g->zoom.initial.x);
+	g_snprintf (s, sizeof(s), "%.3f", g->zoom.x / g->zoom.initial.x);
 	gtk_entry_set_text (g->zoom.widget.h_zoom, s);
-	g_snprintf (s, 32, "%.3f", g->zoom.y / g->zoom.initial.y);
+	g_snprintf (s, sizeof(s), "%.3f", g->zoom.y / g->zoom.initial.y);
 	gtk_entry_set_text (g->zoom.widget.v_zoom, s);
 }
 
@@ -2196,7 +2195,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);
-		g_snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
+		g_snprintf (desc, sizeof(desc), "%.*f", rdigits, i*axis->major + fl);
                 layout = gtk_widget_create_pango_layout(g->drawing_area, desc);
                 pango_layout_get_pixel_size(layout, &w, &h);
                 gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
@@ -2282,7 +2281,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);
-		g_snprintf (desc, 32, "%.*f", rdigits, i*axis->major + fl);
+		g_snprintf (desc, sizeof(desc), "%.*f", rdigits, i*axis->major + fl);
                 layout = gtk_widget_create_pango_layout(g->drawing_area, desc);
                 pango_layout_get_pixel_size(layout, &w, &h);
                 gdk_draw_layout(axis->pixmap[not_disp], g->fg_gc,
@@ -2449,7 +2448,7 @@ static int get_label_dim (struct axis *axis, int dir, double label)
 			break;
 		y = y - floor (y);
 	}
-	g_snprintf (str, 32, "%.*f", rdigits, label);
+	g_snprintf (str, sizeof(str), "%.*f", rdigits, label);
 	switch (dir) {
 	case AXIS_HORIZONTAL:
                 layout = gtk_widget_create_pango_layout(axis->g->drawing_area,
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index c75f302efb..49b8783a64 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -166,7 +166,7 @@ wlanstat_reset (void *phs)
 	const char *filter = NULL;
 
 	if (wlanstat_dlg_w != NULL) {
-		g_snprintf (title, 255, "Wireshark: WLAN Traffic Statistics: %s",
+            g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
 			    cf_get_display_name(&cfile));
 		gtk_window_set_title(GTK_WINDOW(wlanstat_dlg_w), title);
 	}
@@ -184,12 +184,12 @@ wlanstat_reset (void *phs)
 
 	if (wlan_stat->use_dfilter) {
 		if (filter && strlen(filter)) {
-			g_snprintf(title, 255, "Network Overview - Filter: %s", filter);
+                    g_snprintf(title, sizeof(title), "Network Overview - Filter: %s", filter);
 		} else {
-			g_snprintf(title, 255, "Network Overview - No Filter");
+                    g_snprintf(title, sizeof(title), "Network Overview - No Filter");
 		}
 	} else {
-		g_snprintf(title, 255, "Network Overview");
+		g_snprintf(title, sizeof(title), "Network Overview");
 	}
 	gtk_frame_set_label(GTK_FRAME(wlanstat_name_lb), title);
 
@@ -1113,7 +1113,7 @@ wlanstat_dlg_create (void)
 	hs->use_dfilter = FALSE;
 	hs->show_only_existing = FALSE;
 
-	g_snprintf (title, 255, "Wireshark: WLAN Traffic Statistics: %s",
+	g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
 		    cf_get_display_name(&cfile));
 	wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics");
 	gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400);
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index da7b3761db..53db5b2cac 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -101,13 +101,13 @@ wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * unused _U_
 
 
 		/* Maybe we should display the hexadecimal value ? */
-		/* g_snprintf(string_buff, 256, "%s  (0X%x)", data->name, *key); */
+		/* g_snprintf(string_buff, sizeof(string_buff), "%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);
 
-		g_snprintf( string_buff, 256, "%9d", data->packets );
+		g_snprintf( string_buff, sizeof(string_buff), "%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);
@@ -116,7 +116,7 @@ wsp_draw_statuscode(gchar *key _U_, wsp_status_code_t *data, gchar * unused _U_
 		data->sp->index++;
 	} else {
 		/* Just update the label string */
-		g_snprintf( string_buff, 256, "%9d", data->packets );
+            g_snprintf( string_buff, sizeof(string_buff), "%9d", data->packets );
 		 gtk_label_set_text( GTK_LABEL(data->widget), string_buff);
 	}
 }
@@ -211,7 +211,7 @@ wspstat_draw(void *psp)
 
 	for(i=1;i<=sp->num_pdus ; i++)
 	{
-		g_snprintf(str, 256, "%9d",  sp->pdu_stats[i ].packets);
+            g_snprintf(str, sizeof(str), "%9d",  sp->pdu_stats[i ].packets);
 		 gtk_label_set_text( GTK_LABEL(sp->pdu_stats[i].widget), str);
 	}
 
@@ -283,7 +283,7 @@ wsp_init_table(wspstat_t *sp)
 			x=2;
 		}
 		/* Maybe we should display the hexadecimal value ? */
-		/* g_snprintf(buffer, 50, "%s  (0X%x)", match_strval( index2pdut( i ), vals_pdu_type), index2pdut(i) );*/
+		/* g_snprintf(buffer, sizeof(buffer), "%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,