Fix a bunch of warnings.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748

57 files changed, 295 insertions, 293 deletions

diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
index 00ffbbfff1..af1ed51f8a 100644
--- a/ui/cli/tap-bootpstat.c
+++ b/ui/cli/tap-bootpstat.c
@@ -123,7 +123,7 @@ dhcpstat_draw(void *psp)
 	printf("BOOTP Option 53: DHCP Messages Types:\n");
 	printf("DHCP Message Type      Packets nb\n" );
 	g_hash_table_foreach( sp->hash, (GHFunc) dhcp_draw_message_type,
-			"%23s %-9d\n" );
+			(gpointer)"%23s %-9d\n" );
 	printf("===================================================================\n");
 
 }
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index 27720f2153..2ffdc02d0a 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -519,7 +519,7 @@ followDraw(
     {
       while (sc.dlen > 0)
       {
-        len = sc.dlen < sizeof bin ? sc.dlen : sizeof bin;
+        len = sc.dlen < sizeof bin ? sc.dlen : (guint32)sizeof bin;
         sc.dlen -= len;
         if (fread(bin, 1, len, fp->filep) != len)
         {
@@ -549,7 +549,7 @@ followDraw(
 
       while (sc.dlen > 0)
       {
-        len = sc.dlen < sizeof bin ? sc.dlen : sizeof bin;
+        len = sc.dlen < sizeof bin ? sc.dlen : (guint32)sizeof bin;
         sc.dlen -= len;
         if (fread(bin, 1, len, fp->filep) != len)
         {
diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c
index d10291292a..b2911ed5ec 100644
--- a/ui/cli/tap-httpstat.c
+++ b/ui/cli/tap-httpstat.c
@@ -266,10 +266,10 @@ httpstat_draw(void *psp  )
 
 	printf(	"* HTTP Status Codes in reply packets\n");
 	g_hash_table_foreach( sp->hash_responses, (GHFunc)http_draw_hash_responses,
-		"    HTTP %3d %s\n");
+		(gpointer)"    HTTP %3d %s\n");
 	printf("* List of HTTP Request methods\n");
 	g_hash_table_foreach( sp->hash_requests,  (GHFunc)http_draw_hash_requests,
-		"    %9s %d \n");
+		(gpointer)"    %9s %d \n");
 	printf("===================================================================\n");
 }
 
diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c
index 1f290484aa..79b3170bb9 100644
--- a/ui/cli/tap-macltestat.c
+++ b/ui/cli/tap-macltestat.c
@@ -412,12 +412,12 @@ static float calculate_bw(nstime_t *start_time, nstime_t *stop_time, guint32 byt
         /* Only really meaningful if have a few frames spread over time...
            For now at least avoid dividing by something very close to 0.0 */
         if (elapsed_ms < 2.0) {
-           return 0.0;
+           return 0.0f;
         }
         return ((bytes * 8) / elapsed_ms) / 1000;
     }
     else {
-        return 0.0;
+        return 0.0f;
     }
 }
 
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index b9a6ec8f8c..b3d2e3c71d 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -290,12 +290,12 @@ static float calculate_bw(nstime_t *start_time, nstime_t *stop_time, guint32 byt
         /* Only really meaningful if have a few frames spread over time...
            For now at least avoid dividing by something very close to 0.0 */
         if (elapsed_ms < 2.0) {
-           return 0.0;
+           return 0.0f;
         }
         return ((bytes * 8) / elapsed_ms) / 1000;
     }
     else {
-        return 0.0;
+        return 0.0f;
     }
 }
 
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index e0de4b8ec6..8e470c7e14 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -219,10 +219,10 @@ rtspstat_draw(void *psp  )
 
 	printf(	"* RTSP Status Codes in reply packets\n");
 	g_hash_table_foreach( sp->hash_responses, (GHFunc)rtsp_draw_hash_responses,
-		"    RTSP %3d %s\n");
+		(gpointer)"    RTSP %3d %s\n");
 	printf("* List of RTSP Request methods\n");
 	g_hash_table_foreach( sp->hash_requests,  (GHFunc)rtsp_draw_hash_requests,
-		"    %9s %d \n");
+		(gpointer)"    %9s %d \n");
 	printf("===================================================================\n");
 }
 
diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c
index cd794aa030..f2dc0d5024 100644
--- a/ui/cli/tap-sipstat.c
+++ b/ui/cli/tap-sipstat.c
@@ -377,10 +377,10 @@ sipstat_draw(void *psp  )
 	printf("\nNumber of resent SIP messages: %d\n", sp->resent_packets);
 	printf(	"\n* SIP Status Codes in reply packets\n");
 	g_hash_table_foreach( sp->hash_responses, (GHFunc)sip_draw_hash_responses,
-		"  SIP %3d %-15s : %5d Packets\n");
+		(gpointer)"  SIP %3d %-15s : %5d Packets\n");
 	printf("\n* List of SIP Request methods\n");
 	g_hash_table_foreach( sp->hash_requests,  (GHFunc)sip_draw_hash_requests,
-		"  %-15s : %5d Packets\n");
+		(gpointer)"  %-15s : %5d Packets\n");
 	printf(	"\n* Average setup time %d ms\n Min %d ms\n Max %d ms\n", sp->average_setup_time, sp->min_setup_time, sp->max_setup_time);
 	printf("===================================================================\n");
 }
diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c
index 82895ec063..e47bb7ba6e 100644
--- a/ui/cli/tap-wspstat.c
+++ b/ui/cli/tap-wspstat.c
@@ -195,7 +195,7 @@ wspstat_draw(void *psp)
 	printf("\nStatus code in reply packets\n");
 	printf(		"Status Code    Packets  Description\n");
 	g_hash_table_foreach( sp->hash, (GHFunc) wsp_print_statuscode,
-			"       0x%02X  %9d  %s\n" ) ;
+			(gpointer)"       0x%02X  %9d  %s\n" ) ;
 	printf("===================================================================\n");
 }
 
diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c
index 07d7385079..9153b70787 100644
--- a/ui/export_object_smb.c
+++ b/ui/export_object_smb.c
@@ -336,9 +336,9 @@ eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const
                         match_strval(contains, smb_eo_contains_string));
         } else {
             if (new_file->file_length > 0) {
-                percent = (gfloat) 100*new_file->data_gathered/new_file->file_length;
+                percent = (gfloat) (100*new_file->data_gathered/new_file->file_length);
             } else {
-                percent = 0.0;
+                percent = 0.0f;
             }
 
             entry->content_type =
@@ -371,7 +371,7 @@ eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const
                         current_file->file_length,
                         match_strval(current_file->flag_contains, smb_eo_contains_string));
         } else {
-            percent = (gfloat) 100*current_file->data_gathered/current_file->file_length;
+            percent = (gfloat) (100*current_file->data_gathered/current_file->file_length);
             current_entry->content_type =
                 g_strdup_printf("%s (%"G_GUINT64_FORMAT"/%"G_GUINT64_FORMAT") %s [%5.2f%%]",
                         match_strval(eo_info->fid_type, smb_fid_types),
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index 7425364fb4..aea28a8f2f 100644
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -1010,7 +1010,7 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data)
     gtk_widget_show (add_frame);
     gtk_box_pack_start (GTK_BOX (main_v_box), add_frame, TRUE, TRUE, 0);
 
-    add_frame_al = gtk_alignment_new (0.5, 0.5, 1, 1);
+    add_frame_al = gtk_alignment_new (0.5f, 0.5f, 1, 1);
     gtk_widget_set_name (add_frame_al, "add_frame_al");
     gtk_widget_show (add_frame_al);
     gtk_container_add (GTK_CONTAINER (add_frame), add_frame_al);
@@ -1228,7 +1228,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
 
     gchar *row_type,
           *row_key,
-          *row_ssid = "";
+          *row_ssid = NULL;
 
     airpcap_advanced_w = GTK_WIDGET(data);
 
@@ -1265,7 +1265,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
     gtk_widget_show (edit_frame);
     gtk_box_pack_start (GTK_BOX (main_v_box), edit_frame, TRUE, TRUE, 0);
 
-    edit_frame_al = gtk_alignment_new (0.5, 0.5, 1, 1);
+    edit_frame_al = gtk_alignment_new (0.5f, 0.5f, 1, 1);
     gtk_widget_set_name (edit_frame_al, "edit_frame_al");
     gtk_widget_show (edit_frame_al);
     gtk_container_add (GTK_CONTAINER (edit_frame), edit_frame_al);
@@ -1371,7 +1371,7 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
     else
     {
         gtk_widget_set_sensitive(edit_ssid_te,TRUE);
-        gtk_entry_set_text(GTK_ENTRY(edit_ssid_te),row_ssid);
+        gtk_entry_set_text(GTK_ENTRY(edit_ssid_te),row_ssid?row_ssid:"");
     }
 
     /* XXX - Decomment only when WPA and WPA@ will be ready */
@@ -1768,7 +1768,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
                         0);
     gtk_container_set_border_width (GTK_CONTAINER (interface_fr), 10);
 
-    interface_al = gtk_alignment_new (0.5, 0.5, 1, 1);
+    interface_al = gtk_alignment_new (0.5f, 0.5f, 1, 1);
     gtk_widget_set_name (interface_al, "interface_al");
     gtk_widget_show (interface_al);
     gtk_container_add (GTK_CONTAINER (interface_fr), interface_al);
@@ -1821,7 +1821,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
     gtk_box_pack_start (GTK_BOX (settings_sub_box), basic_parameters_fr, TRUE,FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (basic_parameters_fr), 10);
 
-    basic_parameters_al = gtk_alignment_new (0.5, 0.5, 1, 1);
+    basic_parameters_al = gtk_alignment_new (0.5f, 0.5f, 1, 1);
     gtk_widget_set_name (basic_parameters_al, "basic_parameters_al");
     gtk_widget_show (basic_parameters_al);
     gtk_container_add (GTK_CONTAINER (basic_parameters_fr),basic_parameters_al);
@@ -1841,7 +1841,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
     gtk_table_attach (GTK_TABLE (basic_parameters_tb), channel_lb, 0, 1, 0, 1,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (channel_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (channel_lb), 0, 0.5f);
 
     capture_type_lb = gtk_label_new ("Capture Type:");
     gtk_widget_set_name (capture_type_lb, "capture_type_lb");
@@ -1849,7 +1849,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
     gtk_table_attach (GTK_TABLE (basic_parameters_tb), capture_type_lb, 0, 1, 2,
                       3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0),
                       0, 0);
-    gtk_misc_set_alignment (GTK_MISC (capture_type_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (capture_type_lb), 0, 0.5f);
 
     /* Start: Channel offset label */
     channel_offset_lb = gtk_label_new ("Channel Offset:");
@@ -1858,7 +1858,7 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data)
     gtk_table_attach (GTK_TABLE (basic_parameters_tb), channel_offset_lb, 0, 1, 1, 2,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (channel_offset_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (channel_offset_lb), 0, 0.5f);
     /* End: Channel offset label */
 
     /* Start: Channel offset combo box */
@@ -2151,7 +2151,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
     gtk_box_pack_start (GTK_BOX (main_box), keys_fr, FALSE, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (keys_fr), 10);
 
-    keys_al = gtk_alignment_new (0.5, 0.5, 1, 1);
+    keys_al = gtk_alignment_new (0.5f, 0.5f, 1, 1);
     gtk_widget_set_name (keys_al, "keys_al");
     gtk_widget_show (keys_al);
     gtk_container_add (GTK_CONTAINER (keys_fr), keys_al);
@@ -2177,7 +2177,7 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
     gtk_table_attach (GTK_TABLE (decryption_mode_tb), decryption_mode_lb, 1,
                       2, 0, 1, (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (decryption_mode_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (decryption_mode_lb), 0, 0.5f);
 
     decryption_mode_cb = gtk_combo_box_text_new();
     update_decryption_mode_list(decryption_mode_cb);
@@ -2753,7 +2753,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
     gtk_table_attach (GTK_TABLE (radio_tb), keep_lb, 1, 2, 0, 1,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (keep_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (keep_lb), 0, 0.5f);
 
     merge_lb = gtk_label_new ("Merge Wireshark and AirPcap adapter(s) keys.");
     gtk_widget_set_name (merge_lb, "merge_lb");
@@ -2761,7 +2761,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
     gtk_table_attach (GTK_TABLE (radio_tb), merge_lb, 1, 2, 1, 2,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (merge_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (merge_lb), 0, 0.5f);
 
     import_lb =
         gtk_label_new
@@ -2771,7 +2771,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
     gtk_table_attach (GTK_TABLE (radio_tb), import_lb, 1, 2, 2, 3,
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
-    gtk_misc_set_alignment (GTK_MISC (import_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (import_lb), 0, 0.5f);
 
     ignore_lb =
         gtk_label_new
@@ -2782,7 +2782,7 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
                       (GtkAttachOptions) (GTK_FILL),
                       (GtkAttachOptions) (0), 0, 0);
     gtk_label_set_line_wrap (GTK_LABEL (ignore_lb), TRUE);
-    gtk_misc_set_alignment (GTK_MISC (ignore_lb), 0, 0.5);
+    gtk_misc_set_alignment (GTK_MISC (ignore_lb), 0, 0.5f);
 
     low_h_button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_widget_set_name (low_h_button_box, "low_h_button_box");
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index 8b10adf949..c33308cde5 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -269,7 +269,7 @@ airpcap_add_key_to_list(GtkListStore *key_list_store, gchar* type, gchar* key, g
 void
 airpcap_fill_key_list(GtkListStore *key_list_store)
 {
-    gchar*         s = NULL;
+    const gchar*   s = NULL;
     unsigned int i,n;
     airpcap_if_info_t* fake_if_info;
     GList*         wireshark_key_list=NULL;
@@ -411,7 +411,7 @@ airpcap_get_link_type(const gchar* name)
  * Returns the string name corresponding to the given AirpcapLinkType, or
  * NULL in case of error.
  */
-gchar*
+const gchar*
 airpcap_get_link_name(AirpcapLinkType lt)
 {
     if(lt == AIRPCAP_LT_802_11){
@@ -715,7 +715,7 @@ airpcap_add_keys_to_driver_from_list(GtkListStore *key_list_store, airpcap_if_in
     /*
      * Calculate the size of the keys collection
      */
-    KeysCollectionSize = sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(AirpcapKey);
+    KeysCollectionSize = (guint) (sizeof(AirpcapKeysCollection) + keys_in_list * sizeof(AirpcapKey));
 
     /*
      * Allocate the collection
@@ -798,7 +798,7 @@ airpcap_read_and_save_decryption_keys_from_list_store(GtkListStore* key_list_sto
 
     char* tmp_type = NULL;
     char* tmp_key = NULL;
-    char* tmp_ssid = "";
+    char* tmp_ssid = NULL;
 
     decryption_key_t* tmp_dk=NULL;
 
@@ -831,7 +831,7 @@ airpcap_read_and_save_decryption_keys_from_list_store(GtkListStore* key_list_sto
             tmp_dk = (decryption_key_t*)g_malloc(sizeof(decryption_key_t));
             tmp_dk->key = g_string_new(tmp_key);
             tmp_dk->ssid = g_byte_array_new();
-            uri_str_to_bytes(tmp_ssid, tmp_dk->ssid);
+            uri_str_to_bytes(tmp_ssid?tmp_ssid:"", tmp_dk->ssid);
             tmp_dk->type = AIRPDCAP_KEY_TYPE_WPA_PWD;
             tmp_dk->bits = 256;
             key_list = g_list_append(key_list,tmp_dk);
diff --git a/ui/gtk/airpcap_gui_utils.h b/ui/gtk/airpcap_gui_utils.h
index db04d33df1..8de78e56b8 100644
--- a/ui/gtk/airpcap_gui_utils.h
+++ b/ui/gtk/airpcap_gui_utils.h
@@ -110,7 +110,7 @@ airpcap_get_link_type(const gchar* name);
 /*
  * Returns the string name corresponding to the given AirpcapLinkType.
  */
-gchar*
+const gchar*
 airpcap_get_link_name(AirpcapLinkType lt);
 
 /*
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index ac6a8829cf..e0b56b9403 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -1841,7 +1841,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_table_attach_defaults(GTK_TABLE(sampling_tb), samp_count_sb, 1, 2, 1, 2);
 
   sampling_lb = gtk_label_new("packets");
-  gtk_misc_set_alignment(GTK_MISC(sampling_lb), 0, 0.5);
+  gtk_misc_set_alignment(GTK_MISC(sampling_lb), 0, 0.5f);
   gtk_table_attach_defaults(GTK_TABLE(sampling_tb), sampling_lb, 2, 3, 1, 2);
 
   /* "Sampling by timer" row */
@@ -1861,7 +1861,7 @@ options_remote_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_table_attach_defaults(GTK_TABLE(sampling_tb), samp_timer_sb, 1, 2, 2, 3);
 
   sampling_lb = gtk_label_new("milliseconds");
-  gtk_misc_set_alignment(GTK_MISC(sampling_lb), 0, 0.5);
+  gtk_misc_set_alignment(GTK_MISC(sampling_lb), 0, 0.5f);
   gtk_table_attach_defaults(GTK_TABLE(sampling_tb), sampling_lb, 2, 3, 2, 3);
 #endif
 
@@ -2353,7 +2353,7 @@ update_options_table(gint indx)
   GtkTreeView  *if_cb;
   GtkTreeModel *model;
   GtkTreeIter   iter;
-  gchar        *temp, *path_str, *snaplen_string, *linkname = "";
+  gchar        *temp, *path_str, *snaplen_string, *linkname;
   GList        *list;
   link_row     *linkr = NULL;
   gboolean      enabled;
@@ -2366,11 +2366,12 @@ update_options_table(gint indx)
     } else {
       temp = g_strdup_printf("<b>%s</b>\n<span size='small'>%s</span>", device.display_name, device.addresses);
     }
+    linkname = NULL;
     for (list=device.links; list!=NULL; list=g_list_next(list))
     {
       linkr = (link_row*)(list->data);
-      linkname = g_strdup(linkr->name);
       if (linkr->dlt == device.active_dlt) {
+        linkname = g_strdup(linkr->name);
         break;
       }
     }
@@ -2393,11 +2394,11 @@ update_options_table(gint indx)
         g_array_insert_val(global_capture_opts.all_ifaces, marked_interface, device);
       }
   #if defined(HAVE_PCAP_CREATE)
-      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, MONITOR, device.monitor_mode_supported?(device.monitor_mode_enabled?"enabled":"disabled"):"n/a", FILTER, device.cfilter, -1);
+      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, MONITOR, device.monitor_mode_supported?(device.monitor_mode_enabled?"enabled":"disabled"):"n/a", FILTER, device.cfilter, -1);
   #elif defined(_WIN32) && !defined(HAVE_PCAP_CREATE)
-      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp,LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, FILTER, device.cfilter, -1);
+      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp,LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, FILTER, device.cfilter, -1);
   #else
-      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp,LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, FILTER, device.cfilter, -1);
+      gtk_list_store_set (GTK_LIST_STORE(model), &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp,LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, FILTER, device.cfilter, -1);
   #endif
       if (global_capture_opts.num_selected > 0) {
         gtk_widget_set_sensitive(ok_bt, TRUE);
@@ -3455,7 +3456,7 @@ pipe_del_bt_clicked_cb(GtkWidget *w _U_, gpointer data _U_)
   GtkTreeModel     *model, *optmodel;
   GtkTreeIter       iter, optiter;
   GtkTreeView      *if_cb;
-  gchar            *name, *optname = "";
+  gchar            *name, *optname = NULL;
   guint             i;
 
   sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(pipe_l));
@@ -3477,7 +3478,7 @@ pipe_del_bt_clicked_cb(GtkWidget *w _U_, gpointer data _U_)
       if (gtk_tree_model_get_iter_first (optmodel, &optiter)) {
         do {
           gtk_tree_model_get(optmodel, &optiter, IFACE_HIDDEN_NAME, &optname, -1);
-          if (strcmp(optname, name) == 0) {
+          if (optname != NULL && strcmp(optname, name) == 0) {
             gtk_list_store_remove(GTK_LIST_STORE(gtk_tree_view_get_model(if_cb)), &optiter);
             break;
           }
@@ -4485,7 +4486,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
   column = gtk_tree_view_get_column(GTK_TREE_VIEW (view), INTERFACE);
   gtk_tree_view_column_set_min_width(column, 200);
   gtk_tree_view_column_set_resizable(column, TRUE );
-  gtk_tree_view_column_set_alignment(column, 0.5);
+  gtk_tree_view_column_set_alignment(column, 0.5f);
   g_object_set_data(G_OBJECT(column), E_MCAPTURE_COLUMNS_COL_KEY, GINT_TO_POINTER(INTERFACE));
   gtk_tree_view_column_set_clickable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
@@ -4510,12 +4511,12 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_tree_view_column_set_visible(column, TRUE);
   else
     gtk_tree_view_column_set_visible(column, FALSE);
-  gtk_tree_view_column_set_alignment(column, 0.5);
+  gtk_tree_view_column_set_alignment(column, 0.5f);
 
   renderer = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes("Prom. Mode", renderer, "text", PMODE, NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-  g_object_set(renderer, "xalign", 0.5, NULL);
+  g_object_set(renderer, "xalign", 0.5f, NULL);
   gtk_tree_view_column_set_clickable(column, TRUE);
   gtk_tree_view_column_set_reorderable(column, TRUE);
   g_object_set_data(G_OBJECT(column), E_MCAPTURE_COLUMNS_COL_KEY, GINT_TO_POINTER(PMODE));
@@ -4525,7 +4526,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_tree_view_column_set_visible(column, TRUE);
   else
     gtk_tree_view_column_set_visible(column, FALSE);
-  gtk_tree_view_column_set_alignment(column, 0.5);
+  gtk_tree_view_column_set_alignment(column, 0.5f);
 
   renderer = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes("Snaplen [B]", renderer, "text", SNAPLEN, NULL);
@@ -4539,7 +4540,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_tree_view_column_set_visible(column, TRUE);
   else
     gtk_tree_view_column_set_visible(column, FALSE);
-  g_object_set(renderer, "xalign", 0.5, NULL);
+  g_object_set(renderer, "xalign", 0.5f, NULL);
 
 #if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
   renderer = gtk_cell_renderer_text_new();
@@ -4554,7 +4555,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_tree_view_column_set_visible(column, TRUE);
   else
     gtk_tree_view_column_set_visible(column, FALSE);
-  g_object_set(renderer, "xalign", 0.5, NULL);
+  g_object_set(renderer, "xalign", 0.5f, NULL);
 #endif
 
 #if defined (HAVE_PCAP_CREATE)
@@ -4571,13 +4572,13 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     gtk_tree_view_column_set_visible(column, TRUE);
   else
     gtk_tree_view_column_set_visible(column, FALSE);
-  g_object_set(renderer, "xalign", 0.5, NULL);
+  g_object_set(renderer, "xalign", 0.5f, NULL);
 #endif
 
   renderer = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes("Capture Filter", renderer, "text", FILTER, NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-  gtk_tree_view_column_set_alignment(column, 0.5);
+  gtk_tree_view_column_set_alignment(column, 0.5f);
   create_and_fill_model(GTK_TREE_VIEW(view));
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
   gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
@@ -5429,7 +5430,7 @@ create_and_fill_model(GtkTreeView *view)
   GtkListStore *store;
   GtkTreeIter   iter;
   GList        *list;
-  char         *temp = "", *snaplen_string, *linkname="";
+  char         *temp, *snaplen_string, *linkname;
   guint         i;
   link_row     *linkr = NULL;
   interface_t   device;
@@ -5450,11 +5451,12 @@ create_and_fill_model(GtkTreeView *view)
       } else {
         temp = g_strdup_printf("<b>%s</b>\n<span size='small'>%s</span>", device.display_name, device.addresses);
       }
+      linkname = NULL;
       for (list = device.links; list != NULL; list = g_list_next(list)) {
         linkr = (link_row*)(list->data);
-        linkname = g_strdup(linkr->name);
         if (linkr->dlt == device.active_dlt) {
-        break;
+          linkname = g_strdup(linkr->name);
+          break;
         }
       }
       if (device.has_snaplen) {
@@ -5464,11 +5466,11 @@ create_and_fill_model(GtkTreeView *view)
       }
       gtk_list_store_append (store, &iter);
 #if defined(HAVE_PCAP_CREATE)
-      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, MONITOR, device.monitor_mode_supported?(device.monitor_mode_enabled?"enabled":"disabled"):"n/a", FILTER, device.cfilter, -1);
+      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, MONITOR, device.monitor_mode_supported?(device.monitor_mode_enabled?"enabled":"disabled"):"n/a", FILTER, device.cfilter, -1);
 #elif defined(_WIN32) && !defined(HAVE_PCAP_CREATE)
-      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, FILTER, device.cfilter, -1);
+      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, BUFFER, (guint) device.buffer, FILTER, device.cfilter, -1);
 #else
-      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname,  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, FILTER, device.cfilter, -1);
+      gtk_list_store_set (store, &iter, CAPTURE, device.selected, IFACE_HIDDEN_NAME, device.name, INTERFACE, temp, LINK, linkname?linkname:"This should not happen",  PMODE, device.pmode?"enabled":"disabled", SNAPLEN, snaplen_string, FILTER, device.cfilter, -1);
 #endif
     }
   }
diff --git a/ui/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c
index 1b1b1a09c9..b04a706a2b 100644
--- a/ui/gtk/cfilter_combo_utils.c
+++ b/ui/gtk/cfilter_combo_utils.c
@@ -81,7 +81,7 @@ void
 
 /* add a capture filter coming from the user's recent file to the cfilter combo box */
 gboolean
- cfilter_combo_add_recent(gchar *s) {
+ cfilter_combo_add_recent(const gchar *s) {
    gchar *dupstr;
 
    if (s) {
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index 2e57a63654..f003a2591c 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -1962,7 +1962,7 @@ ct_create_popup_menu(conversations_table *ct)
 
 /* Draw/refresh the address fields of a single entry at the specified index */
 static void
-get_ct_table_address(conversations_table *ct, conv_t *conv, char **entries)
+get_ct_table_address(conversations_table *ct, conv_t *conv, const char **entries)
 {
     char *port;
     guint32 pt;
@@ -2017,7 +2017,7 @@ static void
 draw_ct_table_addresses(conversations_table *ct)
 {
     guint32 i;
-    char *entries[4];
+    const char *entries[4];
     GtkListStore *store;
 
     if (!ct->num_conversations)
@@ -2074,7 +2074,7 @@ draw_ct_table_data(conversations_table *ct)
     for(i=0;i<ct->num_conversations;i++){
         char start_time[COL_STR_LEN], duration[COL_STR_LEN],
              txbps[COL_STR_LEN], rxbps[COL_STR_LEN];
-        char *tx_ptr, *rx_ptr;
+        const char *tx_ptr, *rx_ptr;
         double duration_s;
         conv_t *conversation = &g_array_index(ct->conversations, conv_t, i);
 
@@ -2105,7 +2105,7 @@ draw_ct_table_data(conversations_table *ct)
         }
         conversation->modified = FALSE;
         if (!conversation->iter_valid) {
-            char *entries[4];
+            const char *entries[4];
 
             get_ct_table_address(ct, conversation, entries);
             conversation->iter_valid = TRUE;
diff --git a/ui/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c
index 8cf86aef2c..2a2c322c56 100644
--- a/ui/gtk/decode_as_ber.c
+++ b/ui/gtk/decode_as_ber.c
@@ -121,8 +121,8 @@ decode_ber_add_page (packet_info *pinfo _U_)
     /* create page content */
     page_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
     g_object_set_data(G_OBJECT(page_hb), E_PAGE_ACTION, decode_ber);
-    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, "ASN.1");
-    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, "ASN.1");
+    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, (gpointer)"ASN.1");
+    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, (gpointer)"ASN.1");
 
     info_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     gtk_box_pack_start(GTK_BOX(page_hb), info_vb, TRUE, TRUE, 0);
diff --git a/ui/gtk/decode_as_dcerpc.c b/ui/gtk/decode_as_dcerpc.c
index 09d68ba098..6b77506e70 100644
--- a/ui/gtk/decode_as_dcerpc.c
+++ b/ui/gtk/decode_as_dcerpc.c
@@ -358,8 +358,8 @@ decode_dcerpc_add_page (packet_info *pinfo)
     /* create page content */
     page_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
     g_object_set_data(G_OBJECT(page_hb), E_PAGE_ACTION, decode_dcerpc);
-    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, "DCE-RPC");
-    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, "DCE-RPC");
+    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TABLE, (gpointer)"DCE-RPC");
+    g_object_set_data(G_OBJECT(page_hb), E_PAGE_TITLE, (gpointer)"DCE-RPC");
     g_object_set_data(G_OBJECT(page_hb), E_PAGE_BINDING, binding);
 
     info_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index 338acabf83..6c1f31cff2 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -289,7 +289,7 @@ void change_dissector_if_matched(gpointer item, gpointer user_data) {
  * A callback function to parse each "decode as" entry in the file and apply the change
  */
 prefs_set_pref_e
-read_set_decode_as_entries(gchar *key, gchar *value,
+read_set_decode_as_entries(gchar *key, const gchar *value,
 			   void *user_data _U_,
 			   gboolean return_range_errors _U_)
 {
@@ -1638,7 +1638,7 @@ decode_add_tcpudp_page (const gchar *prompt, const gchar *table_name)
     page = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
     g_object_set_data(G_OBJECT(page), E_PAGE_ACTION, decode_transport);
     g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gchar *) table_name);
-    g_object_set_data(G_OBJECT(page), E_PAGE_TITLE, "Transport");
+    g_object_set_data(G_OBJECT(page), E_PAGE_TITLE, (gpointer)"Transport");
 
     /* Always enabled */
     label = gtk_label_new(prompt);
@@ -1717,7 +1717,7 @@ decode_sctp_update_ppid_combo_box(GtkWidget *w _U_, GtkWidget *page)
     if (number_of_ppid)
         ws_combo_box_set_active(GTK_COMBO_BOX(sctp_combo_box), 0); /* default */
 
-    g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, "sctp.ppi");
+    g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gpointer)"sctp.ppi");
 
     sctp_store = g_object_get_data(G_OBJECT(G_OBJECT(decode_w)), "sctp_data");
     gtk_list_store_clear(sctp_store);
@@ -1745,7 +1745,7 @@ decode_sctp_update_srcdst_combo_box(GtkWidget *w _U_, GtkWidget *page)
     ws_combo_box_append_text_and_pointer(GTK_COMBO_BOX(sctp_combo_box), "both", GINT_TO_POINTER(E_DECODE_BPORT));
     ws_combo_box_set_active(GTK_COMBO_BOX(sctp_combo_box), 0);
 
-    g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, "sctp.port");
+    g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gpointer)"sctp.port");
     g_object_set_data(G_OBJECT(page), E_PAGE_SPORT, GINT_TO_POINTER(cfile.edt->pi.srcport));
     g_object_set_data(G_OBJECT(page), E_PAGE_DPORT, GINT_TO_POINTER(cfile.edt->pi.destport));
     sctp_store = g_object_get_data(G_OBJECT(G_OBJECT(decode_w)), "sctp_data");
@@ -1789,7 +1789,7 @@ decode_add_sctp_page (const gchar *prompt, const gchar *table_name)
     page = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5, FALSE);
     g_object_set_data(G_OBJECT(page), E_PAGE_ACTION, decode_transport);
     g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gchar *) table_name);
-    g_object_set_data(G_OBJECT(page), E_PAGE_TITLE, "Transport");
+    g_object_set_data(G_OBJECT(page), E_PAGE_TITLE, (gpointer)"Transport");
 
     vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 5, FALSE);
     radio = decode_sctp_add_port_ppid(page);
@@ -1855,7 +1855,7 @@ decode_bluetooth(GtkWidget *notebook_pg)
                 E_LIST_S_TABLE+1, &handle, -1);
     }
 
-    value = strtol(gtk_entry_get_text((GtkEntry *) g_hash_table_lookup(value_entry_table, table_name)), NULL, 0);
+    value = (guint)strtol(gtk_entry_get_text((GtkEntry *) g_hash_table_lookup(value_entry_table, table_name)), NULL, 0);
 
     if (abbrev != NULL && strcmp(abbrev, "(default)") == 0) {
         dissector_reset_uint(table_name, value);
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c
index 81453a0e9c..eab579c675 100644
--- a/ui/gtk/drag_and_drop.c
+++ b/ui/gtk/drag_and_drop.c
@@ -375,7 +375,7 @@ dnd_init(GtkWidget *w)
     static GtkTargetEntry target_entry[] = {
          /*{"STRING", 0, DND_TARGET_STRING},*/
          /*{"text/plain", 0, DND_TARGET_STRING},*/
-         {"text/uri-list", 0, DND_TARGET_URL}
+         {(gchar *)"text/uri-list", 0, DND_TARGET_URL}
     };
 
     /* set this window as a dnd destination */
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index 05135b2565..24d2841bb1 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -672,7 +672,7 @@ setup_file_import(GtkWidget *main_w)
             switch (text_import_info->dummy_header_type)
             {
             case HEADER_ETH:
-                text_import_info->pid = strtol(gtk_entry_get_text(GTK_ENTRY(etype_te)), NULL, 16);
+                text_import_info->pid = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(etype_te)), NULL, 16);
                 if (text_import_info->pid > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The Ethertype (%x) is too large.",
@@ -686,7 +686,7 @@ setup_file_import(GtkWidget *main_w)
                 break;
 
             case HEADER_IPV4:
-                text_import_info->protocol = strtol(gtk_entry_get_text(GTK_ENTRY(protocol_te)), NULL, 10);
+                text_import_info->protocol = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(protocol_te)), NULL, 10);
                 if (text_import_info->protocol > 0xff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The IPv4 protocol (%u) is too large.",
@@ -701,7 +701,7 @@ setup_file_import(GtkWidget *main_w)
 
             case HEADER_UDP:
             case HEADER_TCP:
-                text_import_info->src_port = strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
+                text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
                 if (text_import_info->src_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
@@ -712,7 +712,7 @@ setup_file_import(GtkWidget *main_w)
                     g_free(text_import_info);
                     return NULL;
                 }
-                text_import_info->dst_port = strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
+                text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
                 if (text_import_info->dst_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
@@ -726,7 +726,7 @@ setup_file_import(GtkWidget *main_w)
                 break;
 
             case HEADER_SCTP:
-                text_import_info->src_port = strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
+                text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
                 if (text_import_info->src_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
@@ -737,7 +737,7 @@ setup_file_import(GtkWidget *main_w)
                     g_free(text_import_info);
                     return NULL;
                 }
-                text_import_info->dst_port = strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
+                text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
                 if (text_import_info->dst_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
@@ -748,11 +748,11 @@ setup_file_import(GtkWidget *main_w)
                     g_free(text_import_info);
                     return NULL;
                 }
-                text_import_info->tag = strtol(gtk_entry_get_text(GTK_ENTRY(tag_te)), NULL, 10);
+                text_import_info->tag = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(tag_te)), NULL, 10);
                 break;
 
             case HEADER_SCTP_DATA:
-                text_import_info->src_port = strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
+                text_import_info->src_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(src_port_te)), NULL, 10);
                 if (text_import_info->src_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The source port (%u) is too large.",
@@ -763,7 +763,7 @@ setup_file_import(GtkWidget *main_w)
                     g_free(text_import_info);
                     return NULL;
                 }
-                text_import_info->dst_port = strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
+                text_import_info->dst_port = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(dst_port_te)), NULL, 10);
                 if (text_import_info->dst_port > 0xffff)
                 {
                     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The destination port (%u) is too large.",
@@ -774,7 +774,7 @@ setup_file_import(GtkWidget *main_w)
                     g_free(text_import_info);
                     return NULL;
                 }
-                text_import_info->ppi = strtol(gtk_entry_get_text(GTK_ENTRY(ppi_te)), NULL, 10);
+                text_import_info->ppi = (guint) strtol(gtk_entry_get_text(GTK_ENTRY(ppi_te)), NULL, 10);
                 break;
 
             default:
@@ -784,7 +784,7 @@ setup_file_import(GtkWidget *main_w)
             text_import_info->dummy_header_type = HEADER_NONE;
         }
 
-        text_import_info->max_frame_length = strtol(gtk_entry_get_text(GTK_ENTRY(framelen_te)), NULL, 10);
+        text_import_info->max_frame_length = (guint)strtol(gtk_entry_get_text(GTK_ENTRY(framelen_te)), NULL, 10);
         if (text_import_info->max_frame_length == 0) {
             text_import_info->max_frame_length = IMPORT_MAX_PACKET;
         }
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 02b02d3abd..8799d7a123 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -379,7 +379,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     GtkTreeViewColumn *column;
     GtkTreeSelection  *sel;
     GtkTreeIter       *l_select;
-    gchar *list_name = NULL;
+    const gchar *list_name = NULL;
 
     /* Get a pointer to a static variable holding the type of filter on
        which we're working, so we can pass that pointer to callback
@@ -489,7 +489,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
     /* This is a Boolean, but we make it a non-null pointer for TRUE
        and a null pointer for FALSE, as object data is a pointer. */
     g_object_set_data(G_OBJECT(filter_l), E_FILT_DBLACTIVATE_KEY,
-                    construct_args->activate_on_ok ? "" : NULL);
+                    construct_args->activate_on_ok ? (gpointer)"" : NULL);
 
     /* fill in data */
     l_select = fill_list(main_w, list_type, filter_te_str);
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 401a3e304d..46d38e83f1 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -390,7 +390,7 @@ follow_print_stream(GtkWidget * w _U_, gpointer data)
 {
 	print_stream_t	*stream;
 	gboolean	 to_file;
-	char		*print_dest;
+	const char	*print_dest;
 	follow_info_t	*follow_info = data;
 #ifdef _WIN32
 	gboolean         win_printer = FALSE;
@@ -711,7 +711,7 @@ forget_follow_info(follow_info_t *follow_info)
 }
 
 void
-follow_stream(gchar *title, follow_info_t *follow_info,
+follow_stream(const gchar *title, follow_info_t *follow_info,
 	      gchar *both_directions_string,
 	      gchar *server_to_client_string, gchar *client_to_server_string)
 {
diff --git a/ui/gtk/follow_stream.h b/ui/gtk/follow_stream.h
index 1d4fef6362..f41ea2405a 100644
--- a/ui/gtk/follow_stream.h
+++ b/ui/gtk/follow_stream.h
@@ -94,7 +94,7 @@ extern GList *follow_infos;
 
 void follow_load_text(follow_info_t *follow_info);
 void follow_filter_out_stream(GtkWidget * w, gpointer parent_w);
-void follow_stream(gchar *title, follow_info_t *follow_info,
+void follow_stream(const gchar *title, follow_info_t *follow_info,
 		   gchar *both_directions_string,
 		   gchar *server_to_client_string,
 		   gchar *client_to_server_string);
diff --git a/ui/gtk/goto_dlg.c b/ui/gtk/goto_dlg.c
index 45a0d9acf7..5f646af4c1 100644
--- a/ui/gtk/goto_dlg.c
+++ b/ui/gtk/goto_dlg.c
@@ -118,12 +118,13 @@ goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
   fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_GOTO_FNUMBER_KEY);
 
   fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-  fnumber = strtoul(fnumber_text, &p, 10);
+  fnumber = (guint) strtoul(fnumber_text, &p, 10);
   if (p == fnumber_text || *p != '\0') {
     /* Illegal number.
        XXX - what about negative numbers (which "strtoul()" allows)?
        Can we hack up signal handlers for the widget to make it
-       reject attempts to type in characters other than digits? */
+       reject attempts to type in characters other than digits?
+       What about numbers > the maximum possible guint? */
     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
 		"The packet number you entered isn't a valid number.");
     return;
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index a0d50762c2..7bc4ac127b 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -304,7 +304,7 @@ static gboolean dialog_graph_dump_to_file(graph_analysis_data_t *user_data)
 	gboolean first_packet  = TRUE;
 
 	GString *label_string, *empty_line,*separator_line, *tmp_str, *tmp_str2;
-	char    *empty_header;
+	const char *empty_header;
 	char     src_port[8],dst_port[8];
 	gchar	*time_str;
 	GList *list;
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index c852edc717..9c7ed95246 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -618,7 +618,7 @@ hostlist_create_popup_menu(hostlist_table *hl)
 
 /* Draw/refresh the address field of a single entry at the specified index */
 static void
-get_hostlist_table_address(hostlist_table *hl, hostlist_talker_t *host, char **entries)
+get_hostlist_table_address(hostlist_table *hl, hostlist_talker_t *host, const char **entries)
 {
     char *port;
     guint32 pt;
@@ -651,7 +651,7 @@ static void
 draw_hostlist_table_addresses(hostlist_table *hl)
 {
     guint32 i;
-    char *entries[2];
+    const char *entries[2];
     GtkListStore *store;
 
     store = GTK_LIST_STORE(gtk_tree_view_get_model(hl->table));
@@ -711,7 +711,7 @@ draw_hostlist_table_data(hostlist_table *hl)
         }
         host->modified = FALSE;
         if (!host->iter_valid) {
-            char *entries[2];
+            const char *entries[2];
 #ifdef HAVE_GEOIP
             char *geoip[NUM_GEOIP_COLS];
             guint j;
@@ -930,7 +930,7 @@ typedef struct {
     hostlist_table    *talkers;
 } map_t;
 
-static char *map_endpoint_opener;
+static const char *map_endpoint_opener;
 
 static void
 map_init(void)
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index d284c71ca4..82eb46ddc9 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -181,7 +181,7 @@ typedef struct _dialog_data_t {
 	GtkWidget *notebook;
 	GtkWidget *save_voice_as_w;
 	GtkWidget *save_csv_as_w;
-	gint notebook_signal_id;
+	gulong notebook_signal_id;
 	dialog_graph_t dialog_graph;
 } dialog_data_t;
 
@@ -2279,7 +2279,8 @@ static void save_voice_as_destroy_cb(GtkWidget *win _U_, gpointer data)
 /* XXX what about endians here? could go something wrong? */
 static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *user_data)
 {
-	int to_fd, forw_fd, rev_fd, fread_cnt = 0, rread = 0, fwritten, rwritten;
+	int to_fd, forw_fd, rev_fd;
+	size_t fread_cnt = 0, rread = 0, fwritten, rwritten;
 	gchar f_pd[1] = {0};
 	gchar r_pd[1] = {0};
 	gint16 sample;
@@ -2317,7 +2318,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* XXX: Should we be checking for write errors below ? */
 		phtonl(pd, 0x2e736e64);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2327,7 +2328,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* header offset == 24 bytes */
 		phtonl(pd, 24);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2337,7 +2338,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* total length, it is permited to set this to 0xffffffff */
 		phtonl(pd, -1);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2347,7 +2348,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* encoding format == 16-bit linear PCM */
 		phtonl(pd, 3);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2357,7 +2358,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* sample rate == 8000 Hz */
 		phtonl(pd, 8000);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2367,7 +2368,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 		/* channels == 1 */
 		phtonl(pd, 1);
 		fwritten = ws_write(to_fd, pd, 4);
-		if ((fwritten < 4) || (fread_cnt < 0)) {
+		if ((fwritten < 4) || (fread_cnt == (size_t)-1)) {
 			ws_close(forw_fd);
 			ws_close(rev_fd);
 			ws_close(to_fd);
@@ -2407,7 +2408,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 					}
 
 					fwritten = ws_write(to_fd, pd, 2);
-					if ((fwritten < 2) || (fread_cnt < 0)) {
+					if ((fwritten < 2) || (fread_cnt == (size_t)-1)) {
 						ws_close(forw_fd);
 						ws_close(rev_fd);
 						ws_close(to_fd);
@@ -2448,7 +2449,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 					}
 
 					rwritten = ws_write(to_fd, pd, 2);
-					if ((rwritten < 2) || (rread < 0)) {
+					if ((rwritten < 2) || (rread == (size_t)-1)) {
 						ws_close(forw_fd);
 						ws_close(rev_fd);
 						ws_close(to_fd);
@@ -2534,7 +2535,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 
 
 					rwritten = ws_write(to_fd, pd, 2);
-					if ((rwritten < 2) || (rread < 0) || (fread_cnt < 0)) {
+					if ((rwritten < 2) || (rread == (size_t)-1) || (fread_cnt == (size_t)-1)) {
 						ws_close(forw_fd);
 						ws_close(rev_fd);
 						ws_close(to_fd);
@@ -2587,7 +2588,7 @@ static gboolean copy_file(gchar *dest, gint channels, gint format, user_data_t *
 
 			rwritten = ws_write(to_fd, pd, 1);
 
-			if ((rwritten < rread) || (rwritten < 0) || (rread < 0)) {
+			if ((rwritten < rread) || (rwritten == (size_t)-1) || (rread == (size_t)-1)) {
 				ws_close(forw_fd);
 				ws_close(rev_fd);
 				ws_close(to_fd);
diff --git a/ui/gtk/io_stat.c b/ui/gtk/io_stat.c
index 3a706e2d75..f6f499444a 100644
--- a/ui/gtk/io_stat.c
+++ b/ui/gtk/io_stat.c
@@ -2151,7 +2151,7 @@ create_advanced_field(io_stat_graph_t *gio, GtkWidget *box)
 	gtk_box_pack_start(GTK_BOX(box), gio->calc_field, TRUE, TRUE, 0);
 	gtk_widget_show(gio->calc_field);
 	g_signal_connect(gio->calc_field, "activate", G_CALLBACK(filter_callback), gio);
-	g_object_set_data (G_OBJECT(gio->calc_field), E_FILT_FIELD_NAME_ONLY_KEY, "");
+	g_object_set_data (G_OBJECT(gio->calc_field), E_FILT_FIELD_NAME_ONLY_KEY, (gpointer)"");
 	g_signal_connect(gio->calc_field, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
 	g_object_set_data(G_OBJECT(box), E_FILT_AUTOCOMP_PTR_KEY, NULL);
 	g_signal_connect(gio->calc_field, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
diff --git a/ui/gtk/mac_lte_stat_dlg.c b/ui/gtk/mac_lte_stat_dlg.c
index 3ca5a08fa7..337ce40538 100644
--- a/ui/gtk/mac_lte_stat_dlg.c
+++ b/ui/gtk/mac_lte_stat_dlg.c
@@ -638,12 +638,12 @@ static float calculate_bw(nstime_t *start_time, nstime_t *stop_time, guint32 byt
         /* Only really meaningful if have a few frames spread over time...
            For now at least avoid dividing by something very close to 0.0 */
         if (elapsed_ms < 2.0) {
-           return 0.0;
+           return 0.0f;
         }
         return ((bytes * 8) / elapsed_ms) / 1000;
     }
     else {
-        return 0.0;
+        return 0.0f;
     }
 }
 
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index 67fe847bb5..713f105f86 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -57,13 +57,13 @@ static gint32 tb80211_current_type = -1;
 static gboolean tb80211_dont_set_chan;
 static gboolean tb80211_dont_set_iface;
 
-static void tb80211_set_info(char *errstr)
+static void tb80211_set_info(const char *errstr)
 {
     gtk_label_set_markup(GTK_LABEL(tb80211_info_label), errstr);
 }
 
 static
-void add_channel_type(char *type, int oldtype, int indx )
+void add_channel_type(const char *type, int oldtype, int indx )
 {
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tb80211_chan_type_box), type);
 
@@ -332,7 +332,7 @@ out_free:
 }
 
 static void
-tb80211_add_label(gchar *text, GtkWidget *tb)
+tb80211_add_label(const gchar *text, GtkWidget *tb)
 {
     GtkWidget     *label;
     GtkToolItem	  *label_ti;
diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c
index 19e991850b..733376c386 100644
--- a/ui/gtk/main_filter_toolbar.c
+++ b/ui/gtk/main_filter_toolbar.c
@@ -162,7 +162,7 @@ filter_toolbar_new(void)
     g_signal_connect(filter_te, "changed", G_CALLBACK(filter_changed_cb), filter_cm);
     g_signal_connect(filter_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
     g_object_set_data(G_OBJECT(filter_tb), E_FILT_AUTOCOMP_PTR_KEY, NULL);
-    g_object_set_data(G_OBJECT(filter_te), E_FILT_FIELD_USE_STATUSBAR_KEY, "");
+    g_object_set_data(G_OBJECT(filter_te), E_FILT_FIELD_USE_STATUSBAR_KEY, (gpointer)"");
     g_signal_connect(filter_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
     g_signal_connect(filter_tb, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
 
@@ -356,7 +356,7 @@ dfilter_recent_combo_write_all(FILE *rf) {
 
 /* add a display filter coming from the user's recent file to the dfilter combo box */
 gboolean
-dfilter_combo_add_recent(gchar *s) {
+dfilter_combo_add_recent(const gchar *s) {
     GtkWidget *filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
     char      *dupstr;
 
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index da345b10aa..511ae29d2c 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -157,7 +157,7 @@ static void menu_name_resolution_update_cb(GtkAction *action, gpointer data);
 static void name_resolution_cb(GtkWidget *w, gpointer d, gboolean* res_flag);
 static void colorize_cb(GtkWidget *w, gpointer d);
 static void rebuild_protocol_prefs_menu (module_t *prefs_module_p, gboolean preferences,
-        GtkUIManager *ui_menu, char *path);
+        GtkUIManager *ui_menu, const char *path);
 
 
 /*  As a general GUI guideline, we try to follow the Gnome Human Interface Guidelines, which can be found at:
@@ -4307,7 +4307,7 @@ menu_open_recent_file_cmd_cb(GtkAction *action, gpointer data _U_)
 }
 
 static void
-add_menu_recent_capture_file_absolute(gchar *cf_name)
+add_menu_recent_capture_file_absolute(const gchar *cf_name)
 {
     GtkWidget *submenu_recent_files;
     GList     *li;
@@ -5186,7 +5186,7 @@ menu_prefs_change_ok (GtkWidget *w, gpointer parent_w)
 
     switch (pref->type) {
     case PREF_UINT:
-        uval = strtoul(new_value, &p, pref->info.base);
+        uval = (guint)strtoul(new_value, &p, pref->info.base);
         if (p == new_value || *p != '\0') {
             simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                           "The value \"%s\" isn't a valid number.",
@@ -5328,7 +5328,7 @@ menu_prefs_edit_dlg (GtkWidget *w, gpointer data)
 }
 
 static guint
-add_protocol_prefs_generic_menu(pref_t *pref, gpointer data, GtkUIManager *ui_menu, char *path)
+add_protocol_prefs_generic_menu(pref_t *pref, gpointer data, GtkUIManager *ui_menu, const char *path)
 {
     GtkWidget        *menu_preferences;
     GtkWidget        *menu_item, *menu_sub_item, *sub_menu;
@@ -5440,7 +5440,7 @@ add_protocol_prefs_packet_list_menu(pref_t *pref, gpointer data)
 
 static void
 rebuild_protocol_prefs_menu(module_t *prefs_module_p, gboolean preferences,
-        GtkUIManager *ui_menu, char *path)
+        GtkUIManager *ui_menu, const char *path)
 {
     GtkWidget *menu_preferences, *menu_item;
     GtkWidget *sub_menu;
diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index ddb2bb5fc4..061f79672b 100644
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -408,7 +408,7 @@ toolbar_new(void)
 }
 
 void
-set_toolbar_object_data(gchar *key, gpointer data)
+set_toolbar_object_data(const gchar *key, gpointer data)
 {
     g_object_set_data(G_OBJECT(open_button), key, data);
     g_object_set_data(G_OBJECT(reload_button), key, data);
diff --git a/ui/gtk/main_toolbar.h b/ui/gtk/main_toolbar.h
index f83daa043c..4a9725364b 100644
--- a/ui/gtk/main_toolbar.h
+++ b/ui/gtk/main_toolbar.h
@@ -42,6 +42,6 @@ void toolbar_redraw_all(void);
  * @param key the key
  * @param data the data to set
  */
-void set_toolbar_object_data(gchar *key, gpointer data);
+void set_toolbar_object_data(const gchar *key, gpointer data);
 
 #endif /* __TOOLBAR_H__ */
diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c
index 0439177734..dc9193a32f 100644
--- a/ui/gtk/mcast_stream.c
+++ b/ui/gtk/mcast_stream.c
@@ -371,7 +371,8 @@ comparetimes(struct timeval *t1, struct timeval *t2, guint16 burstint_lcl)
 static void
 buffusagecalc(mcast_stream_info_t *strinfo, packet_info *pinfo, double emptyspeed_lcl)
 {
-	gint32 sec=0, usec=0, cur, prev;
+	time_t sec=0;
+	gint32 usec=0, cur, prev;
 	struct timeval *buffer;
 	double timeelapsed;
 
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index e7d3329a89..ef7445f246 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -212,7 +212,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
 	fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_1);
 	fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-	fnumber = strtoul(fnumber_text, &p, 10);
+	fnumber = (gint)strtol(fnumber_text, &p, 10);
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 1000) ) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst interval should be between 1 and 1000 ms.");
 		return;
@@ -221,7 +221,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
 	fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_2);
 	fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-	fnumber = strtoul(fnumber_text, &p, 10);
+	fnumber = (gint)strtol(fnumber_text, &p, 10);
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) ) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst alarm threshold you entered isn't valid.");
 		return;
@@ -230,7 +230,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
 	fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_3);
 	fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-	fnumber = strtoul(fnumber_text, &p, 10);
+	fnumber = (gint)strtol(fnumber_text, &p, 10);
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) ) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The buffer alarm threshold you entered isn't valid.");
 		return;
@@ -239,7 +239,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
 	fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_4);
 	fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-	fnumber = strtoul(fnumber_text, &p, 10);
+	fnumber = (gint)strtol(fnumber_text, &p, 10);
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 10000000) ) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The stream empty speed should be between 1 and 10000000");
 		return;
@@ -248,7 +248,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 
 	fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_5);
 	fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te));
-	fnumber = strtoul(fnumber_text, &p, 10);
+	fnumber = (gint)strtol(fnumber_text, &p, 10);
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 10000000) ) {
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The total empty speed should be between 1 and 10000000");
 		return;
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index f3f3407ba7..9740886ff1 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -385,7 +385,7 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col)
 			      "This string has the same syntax as a display filter string.");
 	field_te = gtk_entry_new();
 	gtk_table_attach_defaults(GTK_TABLE(main_tb), field_te, 1, 2, 2, 3);
-	g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, "");
+	g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, (gpointer)"");
 	g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
 	g_signal_connect(field_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
 	g_signal_connect(win, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
@@ -1039,7 +1039,7 @@ scroll_to_and_select_iter(GtkTreeModel *model, GtkTreeSelection *selection, GtkT
 			path,
 			NULL,
 			TRUE,	/* use_align */
-			0.5,	/* row_align determines where the row is placed, 0.5 means center */
+			0.5f,	/* row_align determines where the row is placed, 0.5 means center */
 			0); 	/* The horizontal alignment of the column */
 
 	/* "cursor-changed" signal triggers packet_list_select_cb() */
@@ -1105,7 +1105,7 @@ packet_list_moveto_end(void)
 			path,
 			NULL,
 			TRUE,	/* use_align */
-			0.5,	/* row_align determines where the row is placed, 0.5 means center */
+			0.5f,	/* row_align determines where the row is placed, 0.5 means center */
 			0); 	/* The horizontal alignment of the column */
 
 	gtk_tree_path_free(path);
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index d10e7fb356..c804be8cc0 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -57,7 +57,7 @@
 /** PacketListRecord: represents a row */
 typedef struct _PacketListRecord {
 	/** The column text for some columns */
-	gchar **col_text;
+	const gchar **col_text;
 	/**< The length of the column text strings in 'col_text' */
 	gushort *col_text_len;
 
@@ -1281,7 +1281,7 @@ packet_list_get_widest_column_string(PacketList *packet_list, gint col)
 		PacketListRecord *record;
 		guint vis_idx;
 
-		gchar *widest_column_str = NULL;
+		const gchar *widest_column_str = NULL;
 		guint widest_column_len = 0;
 
 		if (!packet_list->columnized)
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index b6259cd71d..27007d9d8f 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -262,7 +262,7 @@ column_prefs_show(GtkWidget *prefs_window) {
     gtk_widget_show(field_lb);
 
     field_te = gtk_entry_new();
-    g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, "");
+    g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, (gpointer)"");
     g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
 
     /* XXX: column_field_changed_cb will be called for every character entered in the entry box.      */
@@ -293,7 +293,7 @@ column_prefs_show(GtkWidget *prefs_window) {
 
     occurrence_te = gtk_entry_new();
     gtk_entry_set_max_length (GTK_ENTRY(occurrence_te),4);
-    g_object_set_data (G_OBJECT(occurrence_te), "occurrence", "");
+    g_object_set_data (G_OBJECT(occurrence_te), "occurrence", (gpointer)"");
 
     /* XXX: column_occurrence_changed_cb will be called for every character entered in the entry box.      */
     /*       Consider Changing logic so that the field is "accepted" only when a return is entered ?? */
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index 51f74b71d0..9e1789f5ad 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -1061,7 +1061,7 @@ pref_fetch(pref_t *pref, gpointer user_data)
 
   case PREF_UINT:
     str_val = gtk_entry_get_text(GTK_ENTRY(pref->control));
-    uval = strtoul(str_val, &p, pref->info.base);
+    uval = (guint)strtoul(str_val, &p, pref->info.base);
 #if 0
     if (p == value || *p != '\0')
       return PREFS_SET_SYNTAX_ERR;      /* number was bad */
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 34ba81a323..eafb5a9963 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -594,7 +594,7 @@ recent_df_entries_changed_cb(GtkWidget *recent_df_entry _U_,
 	 * filed ...
 	 */
 
-	newval = strtol(gtk_entry_get_text (GTK_ENTRY(recent_df_entries_count_te)), NULL, 10);
+	newval = (guint)strtol(gtk_entry_get_text (GTK_ENTRY(recent_df_entries_count_te)), NULL, 10);
 
 	if (newval > 0) {
 		prefs.gui_recent_df_entries_max = newval;
@@ -619,7 +619,7 @@ recent_files_count_changed_cb(GtkWidget *recent_files_entry _U_,
 	 * filed ...
 	 */
 
-	newval = strtol(gtk_entry_get_text (GTK_ENTRY(recent_files_count_te)), NULL, 10);
+	newval = (guint)strtol(gtk_entry_get_text (GTK_ENTRY(recent_files_count_te)), NULL, 10);
 
 	if (newval > 0) {
 		prefs.gui_recent_files_count_max = newval;
@@ -644,7 +644,7 @@ fileopen_preview_changed_cb(GtkWidget *recent_files_entry _U_,
 	 * filed ...
 	 */
 
-	newval = strtol(gtk_entry_get_text (GTK_ENTRY(fileopen_preview_te)), NULL, 10);
+	newval = (guint)strtol(gtk_entry_get_text (GTK_ENTRY(fileopen_preview_te)), NULL, 10);
 
 	if (newval > 0) {
 		prefs.gui_fileopen_preview = newval;
@@ -705,7 +705,7 @@ scroll_percent_changed_cb(GtkWidget *recent_files_entry _U_,
    * Now, just convert the string to a number and store it in the prefs field ...
    */
 
-  newval = strtol(gtk_entry_get_text(GTK_ENTRY(scroll_percent_te)), NULL, 10);
+  newval = (guint)strtol(gtk_entry_get_text(GTK_ENTRY(scroll_percent_te)), NULL, 10);
   
   if (newval <= 100) {
     prefs.gui_auto_scroll_percentage = newval;
diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c
index c75ffbed9d..c51118f9f7 100644
--- a/ui/gtk/proto_hier_stats_dlg.c
+++ b/ui/gtk/proto_hier_stats_dlg.c
@@ -313,7 +313,7 @@ fill_in_tree_node(GNode *node, gpointer data)
     ph_stats_t      *ps = di->ps;
     draw_info_t     child_di;
     double          seconds;
-    gchar           *text[NUM_STAT_COLUMNS];
+    gchar          *text[NUM_STAT_COLUMNS];
     float           percent_packets, percent_bytes;
     GtkTreeView     *tree_view = di->tree_view;
     GtkTreeIter     *iter = di->iter;
@@ -333,7 +333,7 @@ fill_in_tree_node(GNode *node, gpointer data)
         text[BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
             BANDWIDTH(stats->num_bytes_total, seconds));
     } else {
-        text[BANDWIDTH_COLUMN] = "n.c.";
+        text[BANDWIDTH_COLUMN] = g_strdup("n.c.");
     }
     text[END_PKTS_COLUMN] = g_strdup_printf("%u", stats->num_pkts_last);
     text[END_BYTES_COLUMN] = g_strdup_printf("%u", stats->num_bytes_last);
@@ -341,7 +341,7 @@ fill_in_tree_node(GNode *node, gpointer data)
         text[END_BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
             BANDWIDTH(stats->num_bytes_last, seconds));
     } else {
-        text[END_BANDWIDTH_COLUMN] = "n.c.";
+        text[END_BANDWIDTH_COLUMN] = g_strdup("n.c.");
     }
 
     store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
diff --git a/ui/gtk/rlc_lte_stat_dlg.c b/ui/gtk/rlc_lte_stat_dlg.c
index 8dce4f45b0..a320b7663a 100644
--- a/ui/gtk/rlc_lte_stat_dlg.c
+++ b/ui/gtk/rlc_lte_stat_dlg.c
@@ -584,12 +584,12 @@ static float calculate_bw(nstime_t *start_time, nstime_t *stop_time, guint32 byt
         /* Only really meaningful if have a few frames spread over time...
            For now at least avoid dividing by something very close to 0.0 */
         if (elapsed_ms < 2.0) {
-           return 0.0;
+           return 0.0f;
         }
         return ((bytes * 8) / elapsed_ms) / 1000;
     }
     else {
-        return 0.0;
+        return 0.0f;
     }
 }
 
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 54b6c2e29d..6526e07ec6 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -192,7 +192,7 @@ typedef struct _dialog_data_t {
 	GtkWidget *notebook;
 	GtkWidget *save_voice_as_w;
 	GtkWidget *save_csv_as_w;
-	gint notebook_signal_id;
+	gulong notebook_signal_id;
 	dialog_graph_t dialog_graph;
 } dialog_data_t;
 
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 0e89d5f39c..8596aea262 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -970,8 +970,8 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
 		cairo_rectangle (cr,
 			floor(MIN(u_data->io->x_old,u_data->io->x_new)),
 			floor(MIN(u_data->io->y_old,u_data->io->y_new)),
-			abs((long)(u_data->io->x_new-u_data->io->x_old)),
-			abs((long)(u_data->io->y_new-u_data->io->y_old)));
+			abs((int)(u_data->io->x_new-u_data->io->x_old)),
+			abs((int)(u_data->io->y_new-u_data->io->y_old)));
 		cairo_set_source_rgb (cr, 1, 1, 1);
 		cairo_stroke (cr);
 		cairo_destroy (cr);
@@ -987,7 +987,7 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
 #else
 		gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0);
 #endif
-		cairo_rectangle (cr, 0, 0, abs((long)(u_data->io->x_new-u_data->io->x_old)), abs((long)(u_data->io->y_new-u_data->io->y_old)));
+		cairo_rectangle (cr, 0, 0, abs((int)(u_data->io->x_new-u_data->io->x_old)), abs((int)(u_data->io->y_new-u_data->io->y_old)));
 		cairo_fill (cr);
 
 		cairo_destroy (cr);
@@ -1033,7 +1033,7 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
 	if (event->x < LEFT_BORDER+u_data->io->offset)
 		event->x = LEFT_BORDER+u_data->io->offset;
 
-	if (abs((long)(event->x-u_data->io->x_old))>10 || abs((long)(event->y-u_data->io->y_old))>10)
+	if (abs((int)(event->x-u_data->io->x_old))>10 || abs((int)(event->y-u_data->io->y_old))>10)
 	{
 		u_data->io->rect_x_min = (guint32) floor(MIN(u_data->io->x_old,event->x));
 		u_data->io->rect_x_max = (guint32) ceil(MAX(u_data->io->x_old,event->x));
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index 566b320791..99ed64c59d 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -1360,8 +1360,8 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
 		cairo_rectangle (cr,
 			floor(MIN(u_data->io->x_old,u_data->io->x_new)),
 			floor(MIN(u_data->io->y_old,u_data->io->y_new)),
-			floor(abs((long)(u_data->io->x_new-u_data->io->x_old))),
-			floor(abs((long)(u_data->io->y_new-u_data->io->y_old))));
+			floor(abs((int)(u_data->io->x_new-u_data->io->x_old))),
+			floor(abs((int)(u_data->io->y_new-u_data->io->y_old))));
 		cairo_set_source_rgb (cr, 1, 1, 1);
 		cairo_stroke (cr);
 		cairo_destroy (cr);
@@ -1377,7 +1377,7 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
 #else
 		gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0);
 #endif
-		cairo_rectangle (cr, 0, 0, abs((long)(u_data->io->x_new-u_data->io->x_old)), abs((long)(u_data->io->y_new-u_data->io->y_old)));
+		cairo_rectangle (cr, 0, 0, abs((int)(u_data->io->x_new-u_data->io->x_old)), abs((int)(u_data->io->y_new-u_data->io->y_old)));
 		cairo_fill (cr);
 
 		cairo_destroy (cr);
@@ -1422,7 +1422,7 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
 		event->y = u_data->io->surface_height-BOTTOM_BORDER-u_data->io->offset;
 	if (event->x < LEFT_BORDER+u_data->io->offset)
 		event->x = LEFT_BORDER+u_data->io->offset;
-	if (abs((long)(event->x-u_data->io->x_old))>10 || abs((long)(event->y-u_data->io->y_old))>10)
+	if (abs((int)(event->x-u_data->io->x_old))>10 || abs((int)(event->y-u_data->io->y_old))>10)
 	{
 		u_data->io->rect_x_min = (gint)floor(MIN(u_data->io->x_old,event->x));
 		u_data->io->rect_x_max = (gint)ceil(MAX(u_data->io->x_old,event->x));
diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c
index 513dacc5b5..9f3b8ea954 100644
--- a/ui/gtk/simple_dialog.c
+++ b/ui/gtk/simple_dialog.c
@@ -375,7 +375,7 @@ void simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fct, gpoi
     g_object_set_data(G_OBJECT(GTK_WIDGET(dialog)), CALLBACK_DATA_KEY, data);
 }
 
-void simple_dialog_check_set(gpointer dialog, gchar *text _U_) {
+void simple_dialog_check_set(gpointer dialog, const gchar *text) {
     GtkWidget *ask_cb = g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON);
 
     gtk_button_set_label(GTK_BUTTON(ask_cb), text);
@@ -388,12 +388,12 @@ gboolean simple_dialog_check_get(gpointer dialog) {
     return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb));
 }
 
-char *
+const char *
 simple_dialog_primary_start(void) {
     return "<span weight=\"bold\" size=\"larger\">";
 }
 
-char *
+const char *
 simple_dialog_primary_end(void) {
     return "</span>";
 }
diff --git a/ui/gtk/sip_stat.c b/ui/gtk/sip_stat.c
index 3ccfcd7acc..a5b08ec61d 100644
--- a/ui/gtk/sip_stat.c
+++ b/ui/gtk/sip_stat.c
@@ -538,7 +538,7 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data)
 
 
 static void
-init_table(GtkWidget *main_vb, gchar *title, tbl_info_t *tbl_info)
+init_table(GtkWidget *main_vb, const gchar *title, tbl_info_t *tbl_info)
 {
     GtkWidget *fr;
 
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c
index 0d2908a1d6..691af12483 100644
--- a/ui/gtk/stock_icons.c
+++ b/ui/gtk/stock_icons.c
@@ -95,75 +95,75 @@ void stock_icons_init(void) {
 
     /* register non-standard pixmaps with the gtk-stock engine */
     static const GtkStockItem stock_items[] = {
-        { WIRESHARK_STOCK_CAPTURE_INTERFACES,    "_Interfaces",    0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_OPTIONS,       "_Options",       0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_START,         "_Start",         0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_STOP,          "S_top",          0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_RESTART,       "_Restart",       0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_FILTER,        "_Capture Filter",   0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  "_Capture Filter:",  0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_DETAILS,       "_Details",       0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_INTERFACES,    (char *)"_Interfaces",    0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_OPTIONS,       (char *)"_Options",       0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_START,         (char *)"_Start",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_STOP,          (char *)"S_top",          0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_RESTART,       (char *)"_Restart",       0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER,        (char *)"_Capture Filter",   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  (char *)"_Capture Filter:",  0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CAPTURE_DETAILS,       (char *)"_Details",       0, 0, NULL },
 #ifdef HAVE_GEOIP
-        { WIRESHARK_STOCK_MAP,                   "Map",                   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_MAP,                   (char *)"Map",                   0, 0, NULL },
 #endif
-        { WIRESHARK_STOCK_GRAPH_A_B,             "Graph A->B",            0, 0, NULL },
-        { WIRESHARK_STOCK_GRAPH_B_A,             "Graph B->A",            0, 0, NULL },
-        { WIRESHARK_STOCK_FOLLOW_STREAM,         "Follow Stream",         0, 0, NULL },
-        { WIRESHARK_STOCK_DISPLAY_FILTER,        "Display _Filter",       0, 0, NULL },
-        { WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  "F_ilter:",  0, 0, NULL },
-        { WIRESHARK_STOCK_BROWSE,                "_Browse...",                0, 0, NULL },
-        { WIRESHARK_STOCK_CREATE_STAT,           "Create _Stat",           0, 0, NULL },
-        { WIRESHARK_STOCK_EXPORT,                "_Export...",                0, 0, NULL },
-        { WIRESHARK_STOCK_IMPORT,                "_Import...",                0, 0, NULL },
-        { WIRESHARK_STOCK_EDIT,                  "_Edit...",                  0, 0, NULL },
-        { WIRESHARK_STOCK_ADD_EXPRESSION,        "E_xpression..." ,        0, 0, NULL }, /* plus sign coming from icon */
-        { WIRESHARK_STOCK_CLEAR_EXPRESSION,      "Clea_r" ,                   0, 0, NULL },
-        { WIRESHARK_STOCK_APPLY_EXPRESSION,      "App_ly" ,                   0, 0, NULL },
-        { WIRESHARK_STOCK_SAVE_ALL,              "Save A_ll",             0, 0, NULL },
-        { WIRESHARK_STOCK_DONT_SAVE,             "Continue _without Saving",             0, 0, NULL },
-        { WIRESHARK_STOCK_QUIT_DONT_SAVE,        "Quit _without Saving",             0, 0, NULL },
-        { WIRESHARK_STOCK_STOP_DONT_SAVE,        "Stop and Continue _without Saving",             0, 0, NULL },
-        { WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE,   "Stop and Quit _without Saving",             0, 0, NULL },
-        { WIRESHARK_STOCK_STOP_SAVE,             "Stop and Save",             0, 0, NULL },
-        { WIRESHARK_STOCK_ABOUT,                 "_About",                 0, 0, NULL },
-        { WIRESHARK_STOCK_COLORIZE,              "_Colorize",              0, 0, NULL },
-        { WIRESHARK_STOCK_AUTOSCROLL,            "_Auto Scroll",            0, 0, NULL },
-        { WIRESHARK_STOCK_RESIZE_COLUMNS,        "Resize Columns",        0, 0, NULL },
-        { WIRESHARK_STOCK_TIME,                  "Time",                  0, 0, NULL },
-        { WIRESHARK_STOCK_INTERNET,              "Internet",              0, 0, NULL },
-        { WIRESHARK_STOCK_WEB_SUPPORT,           "Web Support",           0, 0, NULL },
-        { WIRESHARK_STOCK_WIKI,                  "Wiki",                  0, 0, NULL },
-        { WIRESHARK_STOCK_CONVERSATIONS,         "Conversations",         0, 0, NULL },
-        { WIRESHARK_STOCK_ENDPOINTS,             "Endpoints",             0, 0, NULL },
-        { WIRESHARK_STOCK_EXPERT_INFO,           "Expert Info",           0, 0, NULL },
-        { WIRESHARK_STOCK_GRAPHS,                "Graphs",                0, 0, NULL },
-        { WIRESHARK_STOCK_FLOW_GRAPH,            "Flow Graph",            0, 0, NULL },
-        { WIRESHARK_STOCK_TELEPHONY,             "Telephony",             0, 0, NULL },
-        { WIRESHARK_STOCK_DECODE_AS,             "Decode As",             0, 0, NULL },
-        { WIRESHARK_STOCK_CHECKBOX,              "Checkbox",              0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_LIST,         "List Files",         0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_NEXT,         "Next File",         0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_PREVIOUS,     "Previous File",     0, 0, NULL },
-        { WIRESHARK_STOCK_FILTER_OUT_STREAM,     "Filter Out This Stream",     0, 0, NULL },
-        { WIRESHARK_STOCK_ENABLE,                "Enable",                0, 0, NULL },
-        { WIRESHARK_STOCK_DISABLE,               "Disable",               0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR1,                "Color 1",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR2,                "Color 2",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR3,                "Color 3",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR4,                "Color 4",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR5,                "Color 5",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR6,                "Color 6",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR7,                "Color 7",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR8,                "Color 8",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR9,                "Color 9",                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR0,                "Color 10",               0, 0, NULL },
-        { WIRESHARK_STOCK_DECODE,                "Decode",                 0, 0, NULL },
-        { WIRESHARK_STOCK_AUDIO_PLAYER,          "Player",                 0, 0, NULL },
-        { WIRESHARK_STOCK_VOIP_FLOW,             "Flow",                   0, 0, NULL },
-        { WIRESHARK_STOCK_TELEPHONE,             "Telephone",              0, 0, NULL },
-        { WIRESHARK_STOCK_PREPARE_FILTER,        "Prepare Filter",         0, 0, NULL },
-        { WIRESHARK_STOCK_ANALYZE,               "Analyze",                0, 0, NULL },
-        { WIRESHARK_STOCK_SAVE,                  "Save",                   0, 0, NULL }
+        { (char *)WIRESHARK_STOCK_GRAPH_A_B,             (char *)"Graph A->B",            0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_GRAPH_B_A,             (char *)"Graph B->A",            0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FOLLOW_STREAM,         (char *)"Follow Stream",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER,        (char *)"Display _Filter",       0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  (char *)"F_ilter:",  0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_BROWSE,                (char *)"_Browse...",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CREATE_STAT,           (char *)"Create _Stat",           0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EXPORT,                (char *)"_Export...",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_IMPORT,                (char *)"_Import...",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EDIT,                  (char *)"_Edit...",                  0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ADD_EXPRESSION,        (char *)"E_xpression..." ,        0, 0, NULL }, /* plus sign coming from icon */
+        { (char *)WIRESHARK_STOCK_CLEAR_EXPRESSION,      (char *)"Clea_r" ,                   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_APPLY_EXPRESSION,      (char *)"App_ly" ,                   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_SAVE_ALL,              (char *)"Save A_ll",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DONT_SAVE,             (char *)"Continue _without Saving",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_QUIT_DONT_SAVE,        (char *)"Quit _without Saving",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_DONT_SAVE,        (char *)"Stop and Continue _without Saving",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE,   (char *)"Stop and Quit _without Saving",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_STOP_SAVE,             (char *)"Stop and Save",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ABOUT,                 (char *)"_About",                 0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLORIZE,              (char *)"_Colorize",              0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_AUTOSCROLL,            (char *)"_Auto Scroll",            0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_RESIZE_COLUMNS,        (char *)"Resize Columns",        0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TIME,                  (char *)"Time",                  0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_INTERNET,              (char *)"Internet",              0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_WEB_SUPPORT,           (char *)"Web Support",           0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_WIKI,                  (char *)"Wiki",                  0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CONVERSATIONS,         (char *)"Conversations",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ENDPOINTS,             (char *)"Endpoints",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_EXPERT_INFO,           (char *)"Expert Info",           0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_GRAPHS,                (char *)"Graphs",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FLOW_GRAPH,            (char *)"Flow Graph",            0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TELEPHONY,             (char *)"Telephony",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DECODE_AS,             (char *)"Decode As",             0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_CHECKBOX,              (char *)"Checkbox",              0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_LIST,         (char *)"List Files",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_NEXT,         (char *)"Next File",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILE_SET_PREVIOUS,     (char *)"Previous File",     0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_FILTER_OUT_STREAM,     (char *)"Filter Out This Stream",     0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ENABLE,                (char *)"Enable",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DISABLE,               (char *)"Disable",               0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR1,                (char *)"Color 1",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR2,                (char *)"Color 2",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR3,                (char *)"Color 3",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR4,                (char *)"Color 4",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR5,                (char *)"Color 5",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR6,                (char *)"Color 6",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR7,                (char *)"Color 7",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR8,                (char *)"Color 8",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR9,                (char *)"Color 9",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_COLOR0,                (char *)"Color 10",               0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_DECODE,                (char *)"Decode",                 0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_AUDIO_PLAYER,          (char *)"Player",                 0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_VOIP_FLOW,             (char *)"Flow",                   0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_TELEPHONE,             (char *)"Telephone",              0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_PREPARE_FILTER,        (char *)"Prepare Filter",         0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_ANALYZE,               (char *)"Analyze",                0, 0, NULL },
+        { (char *)WIRESHARK_STOCK_SAVE,                  (char *)"Save",                   0, 0, NULL }
     };
 
     static const stock_pixmap_t pixmaps[] = {
diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
index 0ce0db04fb..976aab4756 100644
--- a/ui/gtk/time_shift_dlg.c
+++ b/ui/gtk/time_shift_dlg.c
@@ -429,7 +429,7 @@ time_shift_apply_cb(GtkWidget *ok_bt _U_, GtkWindow *parent_w)
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(flag_rb)) == TRUE) {
     packetnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_SETTIME_PACKETNUMBER_KEY);
-    packet_num = strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet_num = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
     time_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_SETTIME_TIME_KEY);
     time_text = gtk_entry_get_text(GTK_ENTRY(time_te));
@@ -442,14 +442,14 @@ time_shift_apply_cb(GtkWidget *ok_bt _U_, GtkWindow *parent_w)
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(flag_rb)) == TRUE) {
     packetnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_ADJTIME_PACKETNUMBER1_KEY);
-    packet_num = strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet_num = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
     time_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_ADJTIME_TIME1_KEY);
     time_text = gtk_entry_get_text(GTK_ENTRY(time_te));
 
     packetnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_ADJTIME_PACKETNUMBER2_KEY);
-    packet2_num = strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet2_num = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
     time_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w),
             E_ADJTIME_TIME2_KEY);
     time2_text = gtk_entry_get_text(GTK_ENTRY(time_te));
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index 84c1308037..53ee9b1da7 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -3815,7 +3815,6 @@ iax2_calls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, c
 	address* phone;
 	const iax2_info_t *ii = iax2_info;
 	iax2_info_t *tmp_iax2info;
-	gchar * comment;
 
 	if (ii == NULL || ii->ptype != IAX2_FULL_PACKET || (ii->scallno == 0 && ii->dcallno == 0))
 		return 0;
@@ -3874,9 +3873,7 @@ iax2_calls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, c
 		++(callsinfo->npackets);
 	}
 
-	comment = "";
-
-	add_to_graph(tapinfo, pinfo, ii->messageName, comment,
+	add_to_graph(tapinfo, pinfo, ii->messageName, "",
 				 callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1);
 
 	return 1;
diff --git a/ui/qt/display_filter_combo.cpp b/ui/qt/display_filter_combo.cpp
index 3303e4cdda..1d6b121b80 100644
--- a/ui/qt/display_filter_combo.cpp
+++ b/ui/qt/display_filter_combo.cpp
@@ -110,7 +110,7 @@ void DisplayFilterCombo::updateMaxCount()
     setMaxCount(prefs.gui_recent_df_entries_max);
 }
 
-extern "C" gboolean dfilter_combo_add_recent(gchar *filter) {
+extern "C" gboolean dfilter_combo_add_recent(const gchar *filter) {
     if (!cur_display_filter_combo)
         return FALSE;
 
@@ -123,7 +123,7 @@ extern "C" gboolean dfilter_combo_add_recent(gchar *filter) {
 // xxx - Move to an as-yet-to-be-written capture filter module along with ::addRecentCapture and ::writeRecentCapture
 QList<QString> cfilters;
 
-extern "C" gboolean cfilter_combo_add_recent(gchar *filter) {
+extern "C" gboolean cfilter_combo_add_recent(const gchar *filter) {
     cfilters.append(filter);
     return TRUE;
 }
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 667ed35751..02de38bdb0 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -79,7 +79,7 @@ set_last_open_dir(const char *dirname)
  * http://stackoverflow.com/questions/437212/how-do-you-register-a-most-recently-used-list-with-windows-in-preparation-for-win
  */
 extern "C" void
-add_menu_recent_capture_file(gchar *cf_name) {
+add_menu_recent_capture_file(const gchar *cf_name) {
     QString normalized_cf_name = QString::fromUtf8(cf_name);
 //    QDir cf_path;
 
diff --git a/ui/recent_utils.h b/ui/recent_utils.h
index 7d0b3f4d5b..298c27da82 100644
--- a/ui/recent_utils.h
+++ b/ui/recent_utils.h
@@ -32,7 +32,7 @@ extern "C" {
 
 /* Add a new recent capture filename to the "Recent Files" submenu
    (duplicates will be ignored) */
-extern void add_menu_recent_capture_file(gchar *cf_name);
+extern void add_menu_recent_capture_file(const gchar *cf_name);
 
 /** Write all recent capture filenames to the user's recent file.
  * @param rf recent file
@@ -43,7 +43,7 @@ extern void menu_recent_file_write_all(FILE *rf);
  *
  * @param dftext the filter string
  */
-extern gboolean cfilter_combo_add_recent(gchar *s);
+extern gboolean cfilter_combo_add_recent(const gchar *s);
 
 /** Write all non-empty capture filters (until maximum count)
  *  of the combo box GList to the user's recent file.
@@ -56,7 +56,7 @@ extern void cfilter_combo_recent_write_all(FILE *rf);
  *
  * @param dftext the filter string
  */
-extern gboolean dfilter_combo_add_recent(gchar *dftext);
+extern gboolean dfilter_combo_add_recent(const gchar *dftext);
 
 /** Write all non-empty display filters (until maximum count)
  *  of the combo box GList to the user's recent file.
diff --git a/ui/simple_dialog.h b/ui/simple_dialog.h
index 2445c09804..377b49a716 100644
--- a/ui/simple_dialog.h
+++ b/ui/simple_dialog.h
@@ -124,7 +124,7 @@ extern void simple_dialog_close(gpointer dialog);
  * @param dialog the dialog from simple_dialog()
  * @param text the text to display
  */
-extern void simple_dialog_check_set(gpointer dialog, gchar *text);
+extern void simple_dialog_check_set(gpointer dialog, const gchar *text);
 
 /** Get the check buttons state.
  *
@@ -137,12 +137,12 @@ extern gboolean simple_dialog_check_get(gpointer dialog);
  *  simple_dialog_primary_start() and simple_dialog_primary_end().
  *  To highlight the first sentence (will take effect on GTK2 only).
  */
-extern char *simple_dialog_primary_start(void);
+extern const char *simple_dialog_primary_start(void);
 /** Surround the primary dialog message text by
  *  simple_dialog_primary_start() and simple_dialog_primary_end().
  *  To highlight the first sentence (will take effect on GTK2 only).
  */
-extern char *simple_dialog_primary_end(void);
+extern const char *simple_dialog_primary_end(void);
 
 /** Escape the message text, if it probably contains Pango escape sequences.
  *  For example html like tags starting with a <.
diff --git a/ui/ssl_key_export.h b/ui/ssl_key_export.h
index ee5feb8122..82a18c3e49 100644
--- a/ui/ssl_key_export.h
+++ b/ui/ssl_key_export.h
@@ -35,14 +35,14 @@ extern "C" {
  *
  * @return The number of available SSL session keys.
  */
-extern int ssl_session_key_count();
+extern int ssl_session_key_count(void);
 
 /** Dump our SSL Session Keys to a string
  *
  * @return A string containing all the SSL Session Keys. Must be freed with
  * g_free().
  */
-extern gchar* ssl_export_sessions();
+extern gchar* ssl_export_sessions(void);
 
 #ifdef __cplusplus
 }
diff --git a/ui/text_import.c b/ui/text_import.c
index 690e6e8f00..0d38e5c4b7 100644
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -141,7 +141,7 @@ static int debug = 0;
 
 /* Dummy Ethernet header */
 static int hdr_ethernet = FALSE;
-static unsigned long hdr_ethernet_proto = 0;
+static guint32 hdr_ethernet_proto = 0;
 
 /* Dummy IP header */
 static int hdr_ip = FALSE;
@@ -149,40 +149,40 @@ static long hdr_ip_proto = 0;
 
 /* Dummy UDP header */
 static int hdr_udp = FALSE;
-static unsigned long hdr_dest_port = 0;
-static unsigned long hdr_src_port = 0;
+static guint32 hdr_dest_port = 0;
+static guint32 hdr_src_port = 0;
 
 /* Dummy TCP header */
 static int hdr_tcp = FALSE;
 
 /* Dummy SCTP header */
 static int hdr_sctp = FALSE;
-static unsigned long hdr_sctp_src  = 0;
-static unsigned long hdr_sctp_dest = 0;
-static unsigned long hdr_sctp_tag  = 0;
+static guint32 hdr_sctp_src  = 0;
+static guint32 hdr_sctp_dest = 0;
+static guint32 hdr_sctp_tag  = 0;
 
 /* Dummy DATA chunk header */
 static int hdr_data_chunk = FALSE;
-static unsigned char  hdr_data_chunk_type = 0;
-static unsigned char  hdr_data_chunk_bits = 3;
-static unsigned long  hdr_data_chunk_tsn  = 0;
-static unsigned short hdr_data_chunk_sid  = 0;
-static unsigned short hdr_data_chunk_ssn  = 0;
-static unsigned long  hdr_data_chunk_ppid = 0;
+static guint8  hdr_data_chunk_type = 0;
+static guint8  hdr_data_chunk_bits = 3;
+static guint32 hdr_data_chunk_tsn  = 0;
+static guint16 hdr_data_chunk_sid  = 0;
+static guint16 hdr_data_chunk_ssn  = 0;
+static guint32 hdr_data_chunk_ppid = 0;
 
 
 /*--- Local data -----------------------------------------------------------------*/
 
 /* This is where we store the packet currently being built */
-static unsigned char *packet_buf;
-static unsigned long curr_offset = 0;
-static unsigned long max_offset = IMPORT_MAX_PACKET;
-static unsigned long packet_start = 0;
+static guint8 *packet_buf;
+static guint32 curr_offset = 0;
+static guint32 max_offset = IMPORT_MAX_PACKET;
+static guint32 packet_start = 0;
 static void start_new_packet (void);
 
 /* This buffer contains strings present before the packet offset 0 */
 #define PACKET_PREAMBLE_MAX_LEN    2048
-static unsigned char packet_preamble[PACKET_PREAMBLE_MAX_LEN+1];
+static guint8 packet_preamble[PACKET_PREAMBLE_MAX_LEN+1];
 static int packet_preamble_len = 0;
 
 /* Time code of packet, derived from packet_preamble */
@@ -194,7 +194,7 @@ static struct tm timecode_default;
 static wtap_dumper* wdh;
 
 /* HDR_ETH Offset base to parse */
-static unsigned long offset_base = 16;
+static guint32 offset_base = 16;
 
 /* ----- State machine -----------------------------------------------------------*/
 
@@ -306,14 +306,14 @@ typedef struct {
 static hdr_data_chunk_t HDR_DATA_CHUNK = {0, 0, 0, 0, 0, 0, 0};
 
 /* Link-layer type; see net/bpf.h for details */
-static unsigned long pcap_link_type = 1;   /* Default is DLT-EN10MB */
+static guint pcap_link_type = 1;   /* Default is DLT_EN10MB */
 
 /*----------------------------------------------------------------------
  * Parse a single hex number
  * Will abort the program if it can't parse the number
  * Pass in TRUE if this is an offset, FALSE if not
  */
-static unsigned long
+static guint32
 parse_num (const char *str, int offset)
 {
     unsigned long num;
@@ -323,7 +323,7 @@ parse_num (const char *str, int offset)
     if (c==str) {
         fprintf(stderr, "FATAL ERROR: Bad hex number? [%s]\n", str);
     }
-    return num;
+    return (guint32)num;
 }
 
 /*----------------------------------------------------------------------
@@ -332,10 +332,10 @@ parse_num (const char *str, int offset)
 static void
 write_byte (const char *str)
 {
-    unsigned long num;
+    guint32 num;
 
     num = parse_num(str, FALSE);
-    packet_buf[curr_offset] = (unsigned char) num;
+    packet_buf[curr_offset] = (guint8) num;
     curr_offset ++;
     if (curr_offset >= max_offset) /* packet full */
         start_new_packet();
@@ -345,7 +345,7 @@ write_byte (const char *str)
  * Remove bytes from the current packet
  */
 static void
-unwrite_bytes (unsigned long nbytes)
+unwrite_bytes (guint32 nbytes)
 {
     curr_offset -= nbytes;
 }
@@ -353,10 +353,10 @@ unwrite_bytes (unsigned long nbytes)
 /*----------------------------------------------------------------------
  * Determin SCTP chunk padding length
  */
-static unsigned long
-number_of_padding_bytes (unsigned long length)
+static guint32
+number_of_padding_bytes (guint32 length)
 {
-  unsigned long remainder;
+  guint32 remainder;
 
   remainder = length % 4;
 
@@ -384,15 +384,15 @@ write_current_packet (void)
 
         /* Compute packet length */
         prefix_length = 0;
-        if (hdr_data_chunk) { prefix_length += sizeof(HDR_DATA_CHUNK); }
-        if (hdr_sctp) { prefix_length += sizeof(HDR_SCTP); }
-        if (hdr_udp) { prefix_length += sizeof(HDR_UDP); proto_length = prefix_length + curr_offset; }
-        if (hdr_tcp) { prefix_length += sizeof(HDR_TCP); proto_length = prefix_length + curr_offset; }
+        if (hdr_data_chunk) { prefix_length += (int)sizeof(HDR_DATA_CHUNK); }
+        if (hdr_sctp) { prefix_length += (int)sizeof(HDR_SCTP); }
+        if (hdr_udp) { prefix_length += (int)sizeof(HDR_UDP); proto_length = prefix_length + curr_offset; }
+        if (hdr_tcp) { prefix_length += (int)sizeof(HDR_TCP); proto_length = prefix_length + curr_offset; }
         if (hdr_ip) {
-            prefix_length += sizeof(HDR_IP);
+            prefix_length += (int)sizeof(HDR_IP);
             ip_length = prefix_length + curr_offset + ((hdr_data_chunk) ? number_of_padding_bytes(curr_offset) : 0);
         }
-        if (hdr_ethernet) { prefix_length += sizeof(HDR_ETHERNET); }
+        if (hdr_ethernet) { prefix_length += (int)sizeof(HDR_ETHERNET); }
 
         /* Make room for dummy header */
         memmove(&packet_buf[prefix_length], packet_buf, curr_offset);
@@ -408,7 +408,7 @@ write_current_packet (void)
         if (hdr_ethernet) {
             HDR_ETHERNET.l3pid = g_htons(hdr_ethernet_proto);
             memcpy(&packet_buf[prefix_index], &HDR_ETHERNET, sizeof(HDR_ETHERNET));
-            prefix_index += sizeof(HDR_ETHERNET);
+            prefix_index += (int)sizeof(HDR_ETHERNET);
         }
 
         /* Write IP header */
@@ -422,7 +422,7 @@ write_current_packet (void)
             HDR_IP.hdr_checksum = in_cksum(cksum_vector, 1);
 
             memcpy(&packet_buf[prefix_index], &HDR_IP, sizeof(HDR_IP));
-            prefix_index += sizeof(HDR_IP);
+            prefix_index += (int)sizeof(HDR_IP);
         }
 
         /* initialize pseudo header for checksum calculation */
@@ -447,7 +447,7 @@ write_current_packet (void)
             HDR_UDP.checksum = in_cksum(cksum_vector, 3);
 
             memcpy(&packet_buf[prefix_index], &HDR_UDP, sizeof(HDR_UDP));
-            prefix_index += sizeof(HDR_UDP);
+            prefix_index += (int)sizeof(HDR_UDP);
         }
 
         /* Write TCP header */
@@ -466,7 +466,7 @@ write_current_packet (void)
             HDR_TCP.checksum = in_cksum(cksum_vector, 3);
 
             memcpy(&packet_buf[prefix_index], &HDR_TCP, sizeof(HDR_TCP));
-            prefix_index += sizeof(HDR_TCP);
+            prefix_index += (int)sizeof(HDR_TCP);
         }
 
         /* Compute DATA chunk header and append padding */
@@ -498,13 +498,13 @@ write_current_packet (void)
             HDR_SCTP.checksum  = g_htonl(~crc32c_calculate(&packet_buf[prefix_length], curr_offset, HDR_SCTP.checksum));
 
             memcpy(&packet_buf[prefix_index], &HDR_SCTP, sizeof(HDR_SCTP));
-            prefix_index += sizeof(HDR_SCTP);
+            prefix_index += (int)sizeof(HDR_SCTP);
         }
 
         /* Write DATA chunk header */
         if (hdr_data_chunk) {
             memcpy(&packet_buf[prefix_index], &HDR_DATA_CHUNK, sizeof(HDR_DATA_CHUNK));
-            prefix_index += sizeof(HDR_DATA_CHUNK);
+            prefix_index += (int)sizeof(HDR_DATA_CHUNK);
         }
 
         /* Write Ethernet trailer */
@@ -636,7 +636,7 @@ parse_preamble (void)
         else
         {
             /* Parse subseconds */
-            ts_usec = strtol(subsecs, &p, 10);
+            ts_usec = (guint32)strtol(subsecs, &p, 10);
             if (subsecs == p) {
                 /* Error */
                 ts_usec = 0;
@@ -709,7 +709,7 @@ process_directive (char *str)
 void
 parse_token (token_t token, char *str)
 {
-    unsigned long num;
+    guint32 num;
 
     /*
      * This is implemented as a simple state machine of five states.
@@ -782,7 +782,7 @@ parse_token (token_t token, char *str)
                 } else {
                     /* Bad offset; switch to INIT state */
                     if (debug>=1)
-                        fprintf(stderr, "Inconsistent offset. Expecting %0lX, got %0lX. Ignoring rest of packet\n",
+                        fprintf(stderr, "Inconsistent offset. Expecting %0X, got %0X. Ignoring rest of packet\n",
                                 curr_offset, num);
                     write_current_packet();
                     state = INIT;
@@ -863,9 +863,9 @@ parse_token (token_t token, char *str)
 void
 text_import_setup(text_import_info_t *info)
 {
-    packet_buf = (unsigned char *)g_malloc(sizeof(HDR_ETHERNET) + sizeof(HDR_IP) +
-                                           sizeof(HDR_SCTP) + sizeof(HDR_DATA_CHUNK) +
-                                           IMPORT_MAX_PACKET);
+    packet_buf = (guint8 *)g_malloc(sizeof(HDR_ETHERNET) + sizeof(HDR_IP) +
+                                    sizeof(HDR_SCTP) + sizeof(HDR_DATA_CHUNK) +
+                                    IMPORT_MAX_PACKET);
 
     if (!packet_buf)
     {