From Sebastien Tandel:

Fixes for warnings


svn path=/trunk/; revision=21164

8 files changed, 20 insertions, 17 deletions

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 5a86226663..ec5623954d 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -496,7 +496,7 @@ decode_sse(proto_tree* ext_tree, tvbuff_t* tvb, int offset, size_t ext_len)
 
     if(msid_len > A11_MSG_MSID_ELEM_LEN_MAX)
     {
-        p_msid = "MSID is too long";
+        p_msid = (guint8 *)"MSID is too long";
     }else
     {
        /* Decode the BCD digits */
@@ -527,7 +527,7 @@ decode_sse(proto_tree* ext_tree, tvbuff_t* tvb, int offset, size_t ext_len)
    
 
     proto_tree_add_string
-      (ext_tree, hf_a11_ses_msid, tvb, msid_start_offset, msid_len, p_msid);
+      (ext_tree, hf_a11_ses_msid, tvb, msid_start_offset, msid_len, (gchar *)p_msid);
 
     return;
 }
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index e9ed91de1f..7603cd78c2 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -82,7 +82,7 @@ static int dissect_aim_buddylist_reject(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *buddy_tree)
 {
-	char buddyname[MAX_BUDDYNAME_LENGTH+1];
+	guchar buddyname[MAX_BUDDYNAME_LENGTH+1];
 	int offset = 0;
 	int buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 );
 
@@ -107,7 +107,7 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro
 static int dissect_aim_buddylist_offgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *buddy_tree) 
 {
 
-	char buddyname[MAX_BUDDYNAME_LENGTH+1];
+	guchar buddyname[MAX_BUDDYNAME_LENGTH+1];
 	int offset = 0;
 	int buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 );
 
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index ea5cc4234e..26cd3b2cf3 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -85,7 +85,7 @@ static int dissect_aim_chat_userinfo_list(tvbuff_t *tvb, packet_info *pinfo, pro
 
 static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *chat_tree _U_)
 {
-	char *buddyname;
+	guchar *buddyname;
 	guchar *msg;
 	int buddyname_length;
 
@@ -106,7 +106,7 @@ static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, prot
 
 static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *chat_tree)
 {
-	char *buddyname;
+	guchar *buddyname;
 	guchar *msg;
 	/* channel message to client */
 	int buddyname_length;
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index de7ec3abfa..04b71f1763 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -223,14 +223,18 @@ int dissect_aim_tlv_value_rendezvous ( proto_item *ti, guint16 valueid _U_, tvbu
 
 	offset = dissect_aim_capability(entry, tvb, offset);
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, entry, rendezvous_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, entry, 
+							rendezvous_tlvs);
 }
 
-static int dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
+static int dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, 
+						  proto_tree *msg_tree)
 {
 	int offset = 0;
 	const aim_tlv *ch_tlvs = NULL;
 	guint16 channel_id;
+	guchar buddyname[MAX_BUDDYNAME_LENGTH+1];
+	int buddyname_length;
 	
 	/* ICBM Cookie */
 	proto_tree_add_item(msg_tree, hf_aim_icbm_cookie, tvb, offset, 8, FALSE);
@@ -244,11 +248,10 @@ static int dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 
 	/* Add the outgoing username to the info column */
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		char buddyname[MAX_BUDDYNAME_LENGTH+1];
-		int buddyname_length = aim_get_buddyname(buddyname, tvb, offset, 
-											 offset + 1);
+		buddyname_length = aim_get_buddyname(buddyname, tvb, offset, 
+								  offset + 1);
 		col_append_fstr(pinfo->cinfo, COL_INFO, " to: %s",
-						format_text(buddyname, buddyname_length));
+				    format_text(buddyname, buddyname_length));
 	}
 
 	offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 6f323fd443..2a682d11b1 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -79,7 +79,7 @@ static int dissect_aim_snac_signon_signon(tvbuff_t *tvb, packet_info *pinfo,
 {
 	guint8 buddyname_length = 0;
 	int offset = 0;
-	char buddyname[MAX_BUDDYNAME_LENGTH + 1];
+	guchar buddyname[MAX_BUDDYNAME_LENGTH + 1];
 
 	/* Info Type */
 	proto_tree_add_item(tree, hf_aim_infotype, tvb, offset, 2, FALSE);
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 333f1261e6..c007d42db8 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -542,7 +542,7 @@ const aim_family *aim_get_family( guint16 famnum )
 	return NULL;
 }
 
-int aim_get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_offset)
+int aim_get_buddyname( guchar *name, tvbuff_t *tvb, int len_offset, int name_offset)
 {
   guint8 buddyname_length;
 
diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h
index e5a69d831b..c4d6837d18 100644
--- a/epan/dissectors/packet-aim.h
+++ b/epan/dissectors/packet-aim.h
@@ -61,7 +61,7 @@ void aim_init_family(int proto, int ett, guint16 family, const aim_subtype *subt
 
 int dissect_aim_buddyname(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree);
 void aim_get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_length);
-int aim_get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_offset);
+int aim_get_buddyname( guchar *name, tvbuff_t *tvb, int len_offset, int name_offset);
 int dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree);
 
 int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo,
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index bf73b42af5..e5fb99c8e4 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -378,7 +378,7 @@ display_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ajp13_tree)
       /* HEADER VALUE
        */
       orig_pos = pos;
-      hval_len = get_nstring(tvb, pos, hval, sizeof hval);
+      hval_len = get_nstring(tvb, pos, (guint8*)hval, sizeof hval);
 
       pos+=hval_len+2;
       dp = pos - orig_pos;
@@ -629,7 +629,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo,
      */
     orig_pos = pos;
     hval=ep_alloc(8192);
-    hval_len = get_nstring(tvb, pos, hval, 8192);
+    hval_len = get_nstring(tvb, pos, (guint8*)hval, 8192);
 
     pos+=hval_len+2;
     dp = pos - orig_pos;