[Gaim-commits] SF.net SVN: gaim: [16610] trunk/src/protocols/qq

[<mar...@us...>]

Revision: 16610
Author:   markhuetsch
Date:     2006-08-01 12:52:51 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16610&view=rev

Log Message:
-----------
Silenced a few warnings.

Modified Paths:
--------------
    trunk/src/protocols/qq/qq.c
    trunk/src/protocols/qq/utils.c
Modified: trunk/src/protocols/qq/qq.c
===================================================================
--- trunk/src/protocols/qq/qq.c	2006-08-01 19:52:48 UTC (rev 16609)
+++ trunk/src/protocols/qq/qq.c	2006-08-01 19:52:51 UTC (rev 16610)
@@ -444,7 +444,6 @@
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
 
 	qd = (qq_data *) gc->proto_data;
-	//_qq_get_info(gc, uid_to_gaim_name(qd->uid));
 	qq_prepare_modify_info(gc);
 }
 

Modified: trunk/src/protocols/qq/utils.c
===================================================================
--- trunk/src/protocols/qq/utils.c	2006-08-01 19:52:48 UTC (rev 16609)
+++ trunk/src/protocols/qq/utils.c	2006-08-01 19:52:51 UTC (rev 16610)
@@ -92,7 +92,7 @@
 	g_memmove(input, data, len);
 	input[len] = 0x00;
 
-	segments = g_strsplit(input, delimit, 0);
+	segments = g_strsplit((gchar *) input, delimit, 0);
 	if (expected_fields <= 0)
 		return segments;
 
@@ -123,9 +123,12 @@
 // the return needs to be freed
 gchar *gen_ip_str(guint8 *ip)
 {
-	if (ip == NULL || ip[0] == 0)
-	       	return g_strdup_printf("");
-	else 
+	gchar *ret;
+	if (ip == NULL || ip[0] == 0) {
+		ret = g_new(gchar, 1);
+		*ret = '\0';
+	       	return ret;
+	} else 
 		return g_strdup_printf("%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
 }
 
@@ -189,7 +192,7 @@
 		if (incoming[i] >= 0x81)
 			break;
 
-	msg_utf8 = i < len ? qq_to_utf8(&incoming[i], QQ_CHARSET_DEFAULT) : NULL;
+	msg_utf8 = i < len ? qq_to_utf8((gchar *) &incoming[i], QQ_CHARSET_DEFAULT) : NULL;
 
 	if (msg_utf8 != NULL) {
 		gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Try extract GB msg: %s\n", msg_utf8);


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