Squelch various signed vs. unsigned warnings by:

	making pointers to byte data be "guint8 *" rather than "char *",
	and making buffers holding byte data arrays of "guint8" rather
	than arrays of "char";

	making pointers to text strings "char *" rather than "guchar *";

	appropriately casting pointers (cast to "guint8 *" when passing
	to routines expecting "guint8 *" or when assigning to "guint8
	*");

	making port-number preferences "guint";

	making enum preferences "gint";

	making hf_ variables "int".

Clean up white space.

svn path=/trunk/; revision=14884

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index d86ca47093..e882f7a80b 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -1215,7 +1215,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		if ( octet == 0x57 ){ /* IPv6 */
 
 		}else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/
-			tvb_memcpy(tvb, (char *)&sgw_ipv4_address, ie_offset, 4);
+			tvb_memcpy(tvb, (guint8 *)&sgw_ipv4_address, ie_offset, 4);
 			proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_sgw_ipv4, tvb, ie_offset, 4, sgw_ipv4_address);
 
 		}
@@ -1707,7 +1707,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		if ( octet == 0x57 ){ /* IPv6 */
 
 		}else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/
-			tvb_memcpy(tvb, (char *)&unc_ipv4_address, ie_offset, 4);
+			tvb_memcpy(tvb, (guint8 *)&unc_ipv4_address, ie_offset, 4);
 			proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_unc_ipv4, tvb, ie_offset, 4, unc_ipv4_address);
 			rtp_ipv4_address = unc_ipv4_address;
 
@@ -1732,7 +1732,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 		if ( octet == 0x57 ){ /* IPv6 */
 
 		}else{ /* All other values shall be interpreted as Ipv4 address in this version of the protocol.*/
-			tvb_memcpy(tvb, (char *)&GPRS_user_data_ipv4_address, ie_offset, 4);
+			tvb_memcpy(tvb, (guint8 *)&GPRS_user_data_ipv4_address, ie_offset, 4);
 			proto_tree_add_ipv4(urr_ie_tree, hf_uma_urr_GPRS_user_data_transport_ipv4, tvb, ie_offset, 4, GPRS_user_data_ipv4_address);
 
 		}
@@ -1753,7 +1753,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 
 		dst_addr.type=AT_IPv4;
 		dst_addr.len=4;
-		dst_addr.data=(char *)&GPRS_user_data_ipv4_address;
+		dst_addr.data=(guint8 *)&GPRS_user_data_ipv4_address;
 
 		conversation = find_conversation(pinfo->fd->num,&dst_addr,
 			&null_addr, PT_UDP, GPRS_user_data_transport_UDP_port,
@@ -1787,7 +1787,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 
 		dst_addr.type=AT_IPv4;
 		dst_addr.len=4;
-		dst_addr.data=(char *)&unc_ipv4_address;
+		dst_addr.data=(guint8 *)&unc_ipv4_address;
 
 		conversation = find_conversation(pinfo->fd->num,&dst_addr,
 			&null_addr, PT_TCP, UNC_tcp_port,
@@ -1817,7 +1817,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 
 			src_addr.type=AT_IPv4;
 			src_addr.len=4;
-			src_addr.data=(char *)&rtp_ipv4_address;
+			src_addr.data=(guint8 *)&rtp_ipv4_address;
 
 			rtp_add_address(pinfo, &src_addr, RTP_UDP_port, 0, "UMA", pinfo->fd->num, 0);
 			if ((RTP_UDP_port & 0x1) == 0){ /* Even number RTP port RTCP should follow on odd number */
@@ -1835,7 +1835,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
 
 			src_addr.type=AT_IPv4;
 			src_addr.len=4;
-			src_addr.data=(char *)&rtcp_ipv4_address;
+			src_addr.data=(guint8 *)&rtcp_ipv4_address;
 
 			rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->fd->num);
 		}