[Gaim-commits] SF.net SVN: gaim: [16941] trunk/libgaim/protocols/yahoo

[<ma...@us...>]

Revision: 16941
Author:   marv_sf
Date:     2006-08-20 21:42:11 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16941&view=rev

Log Message:
-----------
silence some warnings by casting several things to (char *) that are actually unsigned char *'s.

Modified Paths:
--------------
    trunk/libgaim/protocols/yahoo/yahoo.c
    trunk/libgaim/protocols/yahoo/yahoo_packet.c
    trunk/libgaim/protocols/yahoo/yahoo_picture.c
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-21 04:12:07 UTC (rev 16940)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-21 04:42:11 UTC (rev 16941)
@@ -2382,7 +2382,7 @@
 		yd->rxqueue = g_realloc(yd->rxqueue, yd->rxlen + len + 1);
 		memcpy(yd->rxqueue + yd->rxlen, buf, len);
 		yd->rxlen += len;
-		i = buf = yd->rxqueue;
+		i = buf = (char *)yd->rxqueue;
 		len = yd->rxlen;
 	}
 	buf[len] = '\0';

Modified: trunk/libgaim/protocols/yahoo/yahoo_packet.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_packet.c	2006-08-21 04:12:07 UTC (rev 16940)
+++ trunk/libgaim/protocols/yahoo/yahoo_packet.c	2006-08-21 04:42:11 UTC (rev 16941)
@@ -113,7 +113,7 @@
 void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len)
 {
 	int pos = 0;
-	char key[64], *delimiter, *esc;
+	char key[64], *delimiter;
 	gboolean accept;
 	int x;
 	struct yahoo_pair *pair;
@@ -174,10 +174,13 @@
 			pkt->hash = g_slist_prepend(pkt->hash, pair);
 
 #ifdef DEBUG
-			esc = g_strescape(pair->value, NULL);
-			gaim_debug(GAIM_DEBUG_MISC, "yahoo",
-					   "Key: %d  \tValue: %s\n", pair->key, esc);
-			g_free(esc);
+			{
+				char *esc;
+				esc = g_strescape(pair->value, NULL);
+				gaim_debug(GAIM_DEBUG_MISC, "yahoo",
+						   "Key: %d  \tValue: %s\n", pair->key, esc);
+				g_free(esc);
+			}
 #endif
 		} else {
 			g_free(pair);

Modified: trunk/libgaim/protocols/yahoo/yahoo_picture.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_picture.c	2006-08-21 04:12:07 UTC (rev 16940)
+++ trunk/libgaim/protocols/yahoo/yahoo_picture.c	2006-08-21 04:42:11 UTC (rev 16941)
@@ -464,7 +464,7 @@
 
 	pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf);
 	yahoo_packet_free(pkt);
-	g_string_prepend_len(d->str, pkt_buf, pkt_buf_len);
+	g_string_prepend_len(d->str, (char *)pkt_buf, pkt_buf_len);
 	g_free(pkt_buf);
 
 	g_string_prepend(d->str, header);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.