# HG changeset patch # User Daniel Atallah # Date 1206583791 0 # Node ID c65c96e231b547814db026bc8f7bf0b984ac7937 # Parent 9c83bea8ffd8f90834eb5d6bc590c772bea1a961 Printf warning fixes. diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/msn/slplink.c --- a/libpurple/protocols/msn/slplink.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/msn/slplink.c Thu Mar 27 02:09:51 2008 +0000 @@ -598,7 +598,7 @@ { 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 diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/null/nullprpl.c --- a/libpurple/protocols/null/nullprpl.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/null/nullprpl.c Thu Mar 27 02:09:51 2008 +0000 @@ -321,7 +321,7 @@ } 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(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 @@ 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, diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 27 02:09:51 2008 +0000 @@ -1563,7 +1563,7 @@ { struct pieceofcrap *pos = data; gchar *buf; - ssize_t result; + gssize result; if (!PURPLE_CONNECTION_IS_VALID(pos->gc)) { @@ -1597,7 +1597,7 @@ 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); diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/sametime/sametime.c --- a/libpurple/protocols/sametime/sametime.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/sametime/sametime.c Thu Mar 27 02:09:51 2008 +0000 @@ -378,7 +378,7 @@ 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 @@ 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, diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/simple/simple.c Thu Mar 27 02:09:51 2008 +0000 @@ -947,7 +947,7 @@ 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 { diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/yahoo/yahoo_packet.c --- a/libpurple/protocols/yahoo/yahoo_packet.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.c Thu Mar 27 02:09:51 2008 +0000 @@ -346,7 +346,7 @@ 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) diff -r 9c83bea8ffd8 -r c65c96e231b5 libpurple/protocols/yahoo/yahoochat.c --- a/libpurple/protocols/yahoo/yahoochat.c Thu Mar 27 00:48:54 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Thu Mar 27 02:09:51 2008 +0000 @@ -565,7 +565,7 @@ 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); }