diff src/protocols/yahoo/yahoo.c @ 11127:719779387f96

[gaim-migrate @ 13183] Change the base16 and base64 functions to use better data types, and make appropriate changes to other parts of the Gaim code to get rid of a few warnings and hopefully make things more correct. In other news, why is CVS HEAD crashing for me on exit? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 19 Jul 2005 05:15:45 +0000
parents f03dce7ea408
children 096020ae09a9
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c	Tue Jul 19 03:51:54 2005 +0000
+++ b/src/protocols/yahoo/yahoo.c	Tue Jul 19 05:15:45 2005 +0000
@@ -307,11 +307,12 @@
 			break;
 		case 197: /* Avatars */
 		{
-			char *decoded, *tmp;
-			guint len;
+			guint8 *decoded;
+			char *tmp;
+			gsize len;
 
 			if (pair->value) {
-				gaim_base64_decode(pair->value, &decoded, &len);
+				decoded = gaim_base64_decode(pair->value, &len);
 				if (len) {
 					tmp = gaim_str_binary_to_ascii(decoded, len);
 					gaim_debug_info("yahoo", "Got key 197, value = %s\n", tmp);
@@ -1860,8 +1861,8 @@
 	GSList *l = pkt->hash;
 	char *who = NULL;
 	char *base64 = NULL;
-	char *decoded;
-	int len;
+	guint8 *decoded;
+	gsize len;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -1901,7 +1902,7 @@
 		char *tmp2;
 		YahooFriend *f;
 
-		gaim_base64_decode(base64, &decoded, &len);
+		decoded = gaim_base64_decode(base64, &len);
 		if (len) {
 			char *tmp = gaim_str_binary_to_ascii(decoded, len);
 			gaim_debug_info("yahoo", "Got P2P service packet (from server): who = %s, ip = %s\n", who, tmp);