Fix warnings

svn path=/trunk/; revision=53885

23 files changed, 25 insertions, 25 deletions

diff --git a/ui/gtk/conversations_eth.c b/ui/gtk/conversations_eth.c
index 513579a1d9..12ef06f74c 100644
--- a/ui/gtk/conversations_eth.c
+++ b/ui/gtk/conversations_eth.c
@@ -41,7 +41,7 @@
 static int
 eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const eth_hdr *ehdr=(eth_hdr *)vip;
+	const eth_hdr *ehdr=(const eth_hdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_ETHER, PT_NONE);
 
diff --git a/ui/gtk/conversations_fc.c b/ui/gtk/conversations_fc.c
index 3c66fb88ac..68ecf08aa8 100644
--- a/ui/gtk/conversations_fc.c
+++ b/ui/gtk/conversations_fc.c
@@ -44,7 +44,7 @@
 static int
 fc_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const fc_hdr *fchdr=(fc_hdr *)vip;
+	const fc_hdr *fchdr=(const fc_hdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &fchdr->s_id, &fchdr->d_id, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_NONE, PT_NONE);
 
diff --git a/ui/gtk/conversations_fddi.c b/ui/gtk/conversations_fddi.c
index 39ae8791bf..2b52d81698 100644
--- a/ui/gtk/conversations_fddi.c
+++ b/ui/gtk/conversations_fddi.c
@@ -41,7 +41,7 @@
 static int
 fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const fddi_hdr *ehdr=(fddi_hdr *)vip;
+	const fddi_hdr *ehdr=(const fddi_hdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_FDDI, PT_NONE);
 
diff --git a/ui/gtk/conversations_ip.c b/ui/gtk/conversations_ip.c
index 3be82f2c65..5e84f8766c 100644
--- a/ui/gtk/conversations_ip.c
+++ b/ui/gtk/conversations_ip.c
@@ -41,7 +41,7 @@
 static int
 ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const ws_ip *iph=(ws_ip *)vip;
+	const ws_ip *iph=(const ws_ip *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &iph->ip_src, &iph->ip_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_NONE, PT_NONE);
 
diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c
index e01782c02e..666632ac16 100644
--- a/ui/gtk/conversations_ipv6.c
+++ b/ui/gtk/conversations_ipv6.c
@@ -41,7 +41,7 @@
 static int
 ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-    const struct ip6_hdr *ip6h = (struct ip6_hdr *)vip;
+    const struct ip6_hdr *ip6h = (const struct ip6_hdr *)vip;
     address src;
     address dst;
 
diff --git a/ui/gtk/conversations_ipx.c b/ui/gtk/conversations_ipx.c
index c3036bf78d..f09fb39fa9 100644
--- a/ui/gtk/conversations_ipx.c
+++ b/ui/gtk/conversations_ipx.c
@@ -42,7 +42,7 @@
 static int
 ipx_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const ipxhdr_t *ipxh=(ipxhdr_t *)vip;
+	const ipxhdr_t *ipxh=(const ipxhdr_t *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &ipxh->ipx_src, &ipxh->ipx_dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_NONE, PT_NONE);
 
diff --git a/ui/gtk/conversations_ncp.c b/ui/gtk/conversations_ncp.c
index f7cf956af7..2b938b91b5 100644
--- a/ui/gtk/conversations_ncp.c
+++ b/ui/gtk/conversations_ncp.c
@@ -41,7 +41,7 @@
 static int
 ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const struct ncp_common_header *ncph=(struct ncp_common_header *)vip;
+	const struct ncp_common_header *ncph=(const struct ncp_common_header *)vip;
     guint32 connection;
 
     connection = (ncph->conn_high * 256)+ncph->conn_low;
diff --git a/ui/gtk/conversations_rsvp.c b/ui/gtk/conversations_rsvp.c
index 984cfac701..ac2af88e66 100644
--- a/ui/gtk/conversations_rsvp.c
+++ b/ui/gtk/conversations_rsvp.c
@@ -41,7 +41,7 @@
 static int
 rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const rsvp_conversation_info *rsvph = (rsvp_conversation_info *)vip;
+	const rsvp_conversation_info *rsvph = (const rsvp_conversation_info *)vip;
 
 	add_conversation_table_data((conversations_table *)pct,
 				    &rsvph->source, &rsvph->destination, 0, 0, 1,
diff --git a/ui/gtk/conversations_sctp.c b/ui/gtk/conversations_sctp.c
index 5eed8cb671..02d37a832d 100644
--- a/ui/gtk/conversations_sctp.c
+++ b/ui/gtk/conversations_sctp.c
@@ -41,7 +41,7 @@
 static int
 sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const struct _sctp_info *sctphdr=(struct _sctp_info *)vip;
+	const struct _sctp_info *sctphdr=(const struct _sctp_info *)vip;
 
 	add_conversation_table_data((conversations_table *)pct,
 		&sctphdr->ip_src,
diff --git a/ui/gtk/conversations_tcpip.c b/ui/gtk/conversations_tcpip.c
index f986693fd3..bbe9048a67 100644
--- a/ui/gtk/conversations_tcpip.c
+++ b/ui/gtk/conversations_tcpip.c
@@ -41,7 +41,7 @@
 static int
 tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const struct tcpheader *tcphdr=(struct tcpheader *)vip;
+	const struct tcpheader *tcphdr=(const struct tcpheader *)vip;
 
 	add_conversation_table_data_with_conv_id((conversations_table *)pct, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, (conv_id_t) tcphdr->th_stream, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_NONE, PT_TCP);
 
diff --git a/ui/gtk/conversations_tr.c b/ui/gtk/conversations_tr.c
index 3f91458a52..4b569e370f 100644
--- a/ui/gtk/conversations_tr.c
+++ b/ui/gtk/conversations_tr.c
@@ -41,7 +41,7 @@
 static int
 tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const tr_hdr *trhdr=(tr_hdr *)vip;
+	const tr_hdr *trhdr=(const tr_hdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &trhdr->src, &trhdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_TOKENRING, PT_NONE);
 
diff --git a/ui/gtk/conversations_udpip.c b/ui/gtk/conversations_udpip.c
index 8b24bd785a..91c8a36927 100644
--- a/ui/gtk/conversations_udpip.c
+++ b/ui/gtk/conversations_udpip.c
@@ -41,7 +41,7 @@
 static int
 udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const e_udphdr *udphdr=(e_udphdr *)vip;
+	const e_udphdr *udphdr=(const e_udphdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &udphdr->ip_src, &udphdr->ip_dst, udphdr->uh_sport, udphdr->uh_dport, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_NONE, PT_UDP);
 
diff --git a/ui/gtk/conversations_wlan.c b/ui/gtk/conversations_wlan.c
index 8050ce90aa..ca1f69973c 100644
--- a/ui/gtk/conversations_wlan.c
+++ b/ui/gtk/conversations_wlan.c
@@ -41,7 +41,7 @@
 static int
 wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-	const wlan_hdr *whdr=(wlan_hdr *)vip;
+	const wlan_hdr *whdr=(const wlan_hdr *)vip;
 
 	add_conversation_table_data((conversations_table *)pct, &whdr->src, &whdr->dst, 0, 0, 1, pinfo->fd->pkt_len, &pinfo->rel_ts, SAT_WLAN, PT_NONE);
 
diff --git a/ui/gtk/hostlist_fc.c b/ui/gtk/hostlist_fc.c
index 8db5fc4173..2add39d5dc 100644
--- a/ui/gtk/hostlist_fc.c
+++ b/ui/gtk/hostlist_fc.c
@@ -45,7 +45,7 @@ static int
 fc_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const fc_hdr *fchdr=(fc_hdr *)vip;
+	const fc_hdr *fchdr=(const fc_hdr *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_fddi.c b/ui/gtk/hostlist_fddi.c
index 2ff3309ef4..fcb26e3363 100644
--- a/ui/gtk/hostlist_fddi.c
+++ b/ui/gtk/hostlist_fddi.c
@@ -42,7 +42,7 @@ static int
 fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const fddi_hdr *ehdr=(fddi_hdr *)vip;
+	const fddi_hdr *ehdr=(const fddi_hdr *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_ip.c b/ui/gtk/hostlist_ip.c
index 7528899073..7c26766b76 100644
--- a/ui/gtk/hostlist_ip.c
+++ b/ui/gtk/hostlist_ip.c
@@ -44,7 +44,7 @@ static int
 ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const ws_ip *iph=(ws_ip *)vip;
+	const ws_ip *iph=(const ws_ip *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_ipv6.c b/ui/gtk/hostlist_ipv6.c
index 89f1fba6f5..4181b4cef6 100644
--- a/ui/gtk/hostlist_ipv6.c
+++ b/ui/gtk/hostlist_ipv6.c
@@ -45,7 +45,7 @@ static int
 ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
     hostlist_table *hosts = (hostlist_table *)pit;
-    const struct ip6_hdr *ip6h = (struct ip6_hdr *)vip;
+    const struct ip6_hdr *ip6h = (const struct ip6_hdr *)vip;
     address src;
     address dst;
 
diff --git a/ui/gtk/hostlist_ipx.c b/ui/gtk/hostlist_ipx.c
index afb9782825..8da378576a 100644
--- a/ui/gtk/hostlist_ipx.c
+++ b/ui/gtk/hostlist_ipx.c
@@ -42,7 +42,7 @@ static int
 ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const ipxhdr_t *ipxh=(ipxhdr_t *)vip;
+	const ipxhdr_t *ipxh=(const ipxhdr_t *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_jxta.c b/ui/gtk/hostlist_jxta.c
index b9b4a8de30..b169277ea2 100644
--- a/ui/gtk/hostlist_jxta.c
+++ b/ui/gtk/hostlist_jxta.c
@@ -42,7 +42,7 @@ static int
 jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts = (hostlist_table *) pit;
-	const jxta_tap_header *jxtahdr = (jxta_tap_header *)vip;
+	const jxta_tap_header *jxtahdr = (const jxta_tap_header *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_rsvp.c b/ui/gtk/hostlist_rsvp.c
index 8235383a7b..85dfed4d60 100644
--- a/ui/gtk/hostlist_rsvp.c
+++ b/ui/gtk/hostlist_rsvp.c
@@ -43,7 +43,7 @@ static int
 rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const rsvp_conversation_info *rsvph = (rsvp_conversation_info *)vip;
+	const rsvp_conversation_info *rsvph = (const rsvp_conversation_info *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures
 	 * that all packets are counted properly (even if address is sending to
diff --git a/ui/gtk/hostlist_sctp.c b/ui/gtk/hostlist_sctp.c
index ae81c59743..69f28f2c66 100644
--- a/ui/gtk/hostlist_sctp.c
+++ b/ui/gtk/hostlist_sctp.c
@@ -41,7 +41,7 @@ static int
 sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
         hostlist_table *hosts=(hostlist_table *)pit;
-        const struct _sctp_info *sctphdr=(struct _sctp_info *)vip;
+        const struct _sctp_info *sctphdr=(const struct _sctp_info *)vip;
 
         /* Take two "add" passes per packet, adding for each direction, ensures that all
         packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/hostlist_udpip.c b/ui/gtk/hostlist_udpip.c
index 695d6cb49b..74586ac08c 100644
--- a/ui/gtk/hostlist_udpip.c
+++ b/ui/gtk/hostlist_udpip.c
@@ -42,7 +42,7 @@ static int
 udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
 	hostlist_table *hosts=(hostlist_table *)pit;
-	const e_udphdr *udphdr=(e_udphdr *)vip;
+	const e_udphdr *udphdr=(const e_udphdr *)vip;
 
 	/* Take two "add" passes per packet, adding for each direction, ensures that all
 	packets are counted properly (even if address is sending to itself)
diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c
index 06835f8773..bdd4686d29 100644
--- a/ui/gtk/time_shift_dlg.c
+++ b/ui/gtk/time_shift_dlg.c
@@ -430,7 +430,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 = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet_num = (guint)strtol(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));
@@ -443,14 +443,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 = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet_num = (guint)strtol(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 = (guint)strtol((char *)gtk_entry_get_text(GTK_ENTRY(packetnumber_te)), NULL, 10);
+    packet2_num = (guint)strtol(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));