pidgin: 83dcf4e5: Printf warning fixes.

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 83dcf4e58b35065eac18aea599a66d165135124a
Ancestor: cb4f5b0d3912d93defd2b82b203e27338be4bc6e
Author: datallah at pidgin.im
Date: 2008-03-27T02:09:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/83dcf4e58b35065eac18aea599a66d165135124a

Modified files:
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoochat.c

ChangeLog: 

Printf warning fixes.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slplink.c	2a095771be3adaf39d427b9e4455bfddaaeabbf8
+++ libpurple/protocols/msn/slplink.c	621ca0ce1d83e0375d9842d9d4485da97124f0e4
@@ -598,7 +598,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 	{
 		if ((offset + len) > slpmsg->size)
 		{
-			purple_debug_error("msn", "Oversized slpmsg\n");
+			purple_debug_error("msn", "Oversized slpmsg - msgsize=%lld offset=%d len=%d\n", slpmsg->size, offset, len);
 			g_return_if_reached();
 		}
 		else
============================================================
--- libpurple/protocols/null/nullprpl.c	df1c68bccb75696b84e30babf629cc0df6a2899b
+++ libpurple/protocols/null/nullprpl.c	5e93ce69228cf23f2fe29e066bad1bec261d4db7
@@ -321,7 +321,7 @@ static void blist_example_menu_item(Purp
 }
 
 static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) {
-  purple_debug_info("nullprpl", "example menu item clicked on user\n",
+  purple_debug_info("nullprpl", "example menu item clicked on user %s\n",
                     ((PurpleBuddy *)node)->name);
 
   purple_notify_info(NULL,  /* plugin handle or PurpleConnection */
@@ -890,7 +890,7 @@ static void nullprpl_alias_buddy(PurpleC
 
 static void nullprpl_alias_buddy(PurpleConnection *gc, const char *who,
                                  const char *alias) {
- purple_debug_info("nullprpl", "%s sets %'s alias to %s\n",
+ purple_debug_info("nullprpl", "%s sets %s's alias to %s\n",
                    gc->account->username, who, alias);
 }
 
@@ -898,7 +898,7 @@ static void nullprpl_group_buddy(PurpleC
                                  const char *old_group,
                                  const char *new_group) {
   purple_debug_info("nullprpl", "%s has moved %s from group %s to group %s\n",
-                    who, old_group, new_group);
+                    gc->account->username, who, old_group, new_group);
 }
 
 static void nullprpl_rename_group(PurpleConnection *gc, const char *old_name,
============================================================
--- libpurple/protocols/oscar/oscar.c	2ddba48470ece7d5ec4557d44cc9a247a2c9d31d
+++ libpurple/protocols/oscar/oscar.c	4cb8d4030fd1717d26871c5c41fcd9c653822f99
@@ -1563,7 +1563,7 @@ straight_to_hell(gpointer data, gint sou
 {
 	struct pieceofcrap *pos = data;
 	gchar *buf;
-	ssize_t result;
+	gssize result;
 
 	if (!PURPLE_CONNECTION_IS_VALID(pos->gc))
 	{
@@ -1597,7 +1597,7 @@ straight_to_hell(gpointer data, gint sou
 		else
 			purple_debug_error("oscar", "Tried to write %"
 					G_GSIZE_FORMAT " bytes to fetch AIM hash data but "
-					"instead wrote %" G_GSIZE_FORMAT " bytes\n",
+					"instead wrote %" G_GSSIZE_FORMAT " bytes\n",
 					strlen(buf), result);
 	}
 	g_free(buf);
============================================================
--- libpurple/protocols/sametime/sametime.c	6d31298db62cd036e2597653eaa345dcbbabb21d
+++ libpurple/protocols/sametime/sametime.c	9669dedc3f956f2a52e351bf7969fcee53e75e5d
@@ -378,7 +378,7 @@ static int mw_session_io_write(struct mw
 static int mw_session_io_write(struct mwSession *session,
 			       const guchar *buf, gsize len) {
   struct mwPurplePluginData *pd;
-  ssize_t ret = 0;
+  gssize ret = 0;
   int err = 0;
 
   pd = mwSession_getClientData(session);
@@ -413,7 +413,7 @@ static int mw_session_io_write(struct mw
     pd->outpa = purple_input_add(pd->socket, PURPLE_INPUT_WRITE, write_cb, pd);
 
   } else if(len > 0) {
-    DEBUG_ERROR("write returned %" G_GSIZE_FORMAT ", %" G_GSIZE_FORMAT
+    DEBUG_ERROR("write returned %" G_GSSIZE_FORMAT ", %" G_GSIZE_FORMAT
 			" bytes left unwritten\n", ret, len);
     purple_connection_error_reason(pd->gc,
                                    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
============================================================
--- libpurple/protocols/simple/simple.c	7c6473d029a3602b727963eda0e09aba20b7f59c
+++ libpurple/protocols/simple/simple.c	6f560bba5995648dab064514f7360bdd4b90af32
@@ -947,7 +947,7 @@ static gboolean resend_timeout(struct si
 	while(tmp) {
 		struct transaction *trans = tmp->data;
 		tmp = tmp->next;
-		purple_debug_info("simple", "have open transaction age: %d\n", currtime- trans->time);
+		purple_debug_info("simple", "have open transaction age: %lu\n", currtime- trans->time);
 		if((currtime - trans->time > 5) && trans->retries >= 1) {
 			/* TODO 408 */
 		} else {
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.c	95f72b1b652818f7bde0cf587b77eca0506e5086
+++ libpurple/protocols/yahoo/yahoo_packet.c	9e7eb947f4d4498aa79a72ea758c7adce7688302
@@ -346,7 +346,7 @@ int yahoo_packet_send(struct yahoo_packe
 int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd)
 {
 	size_t len;
-	ssize_t ret;
+	gssize ret;
 	guchar *data;
 
 	if (yd->fd < 0)
============================================================
--- libpurple/protocols/yahoo/yahoochat.c	2de205f18f17c44cf99f049c589abfa3d1fb38d9
+++ libpurple/protocols/yahoo/yahoochat.c	e751ba4d1c8637a239f8f0a18413214cc69133fe
@@ -565,7 +565,7 @@ void yahoo_process_chat_join(PurpleConne
 		for (l = account->deny; l != NULL; l = l->next) {
 			for (roomies = members; roomies; roomies = roomies->next) {
 				if (!purple_utf8_strcasecmp((char *)l->data, roomies->data)) {
-					purple_debug_info("yahoo", "Ignoring room member %s in room %s\n" , roomies->data, room ? room : "");
+					purple_debug_info("yahoo", "Ignoring room member %s in room %s\n" , (char *)roomies->data, room ? room : "");
 					purple_conv_chat_ignore(PURPLE_CONV_CHAT(c),roomies->data);
 					ops->chat_update_user(c, roomies->data);
 				}