pidgin: 0caa3982: Fix a bunch of compiler warnings caused ...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Mar 16 16:40:48 EDT 2008
-----------------------------------------------------------------
Revision: 0caa39824f21f7f7dd7abf1462fbc769730120de
Ancestor: 020c412ea16ccc19ef6d570f35d9caea6b0c5f59
Author: markdoliner at pidgin.im
Date: 2008-03-16T20:36:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0caa39824f21f7f7dd7abf1462fbc769730120de
Modified files:
libpurple/certificate.c libpurple/dnsquery.c
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/gg/gg.c
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/msn/directconn.c
libpurple/protocols/msnp9/directconn.c
libpurple/protocols/msnp9/msn.c
libpurple/protocols/msnp9/switchboard.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/user.c
libpurple/protocols/oscar/family_buddy.c
libpurple/protocols/oscar/family_chatnav.c
libpurple/protocols/oscar/family_icq.c
libpurple/protocols/oscar/family_oservice.c
libpurple/protocols/oscar/family_userlookup.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/qq/qq_proxy.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/yahoo/yahoo_aliases.c
libpurple/protocols/yahoo/yahoo_packet.c
libpurple/protocols/yahoo/yahoo_profile.c libpurple/proxy.c
libpurple/util.c pidgin/gtkmain.c
ChangeLog:
Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
to our debug functions (I really thought we had added that in a while ago?)
I didn't fix all of them... just most of them.
Oh, see these pages for a little info:
http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Macros.html#G-GNUC-PRINTF:CAPS
-------------- next part --------------
============================================================
--- libpurple/certificate.c c2b239f32efe93a3196275bde9a0a364e560b487
+++ libpurple/certificate.c 0d7a2f179b9f4248a61db7b7b9cee760dd98da78
@@ -695,7 +695,7 @@ x509_ca_lazy_init(void)
for (iter = x509_ca_paths; iter; iter = iter->next) {
certdir = g_dir_open(iter->data, 0, NULL);
if (!certdir) {
- purple_debug_error("certificate/x509/ca", "Couldn't open location '%s'\n", iter->data);
+ purple_debug_error("certificate/x509/ca", "Couldn't open location '%s'\n", (const char *)iter->data);
continue;
}
============================================================
--- libpurple/dnsquery.c ecb11160a2d07852718885a0f14c171aa3ac68bb
+++ libpurple/dnsquery.c d248338535a85030214ef837622fe09220efa606
@@ -450,7 +450,7 @@ send_dns_request_to_child(PurpleDnsQuery
/* Send the data structure to the child */
rc = write(resolver->fd_in, &dns_params, sizeof(dns_params));
if (rc < 0) {
- purple_debug_error("dns", "Unable to write to DNS child %d: %d\n",
+ purple_debug_error("dns", "Unable to write to DNS child %d: %s\n",
resolver->dns_pid, g_strerror(errno));
purple_dnsquery_resolver_destroy(resolver);
return FALSE;
============================================================
--- libpurple/protocols/bonjour/bonjour_ft.c 43ebf9b9479e15c6a3c02aa75b469480ade7c899
+++ libpurple/protocols/bonjour/bonjour_ft.c 50208fcb066cf271ec9e542c7e205c94b75ef351
@@ -489,7 +489,7 @@ xep_si_parse(PurpleConnection *pc, xmlno
else
purple_xfer_cancel_remote(xfer);
} else
- purple_debug_info("bonjour", "si offer Message type - Unknown-%d.\n", type);
+ purple_debug_info("bonjour", "si offer Message type - Unknown-%s.\n", type);
}
}
============================================================
--- libpurple/protocols/bonjour/jabber.c d907b13b82dd3527fdc40a5c15cb524a6c75f0df
+++ libpurple/protocols/bonjour/jabber.c b8f26aae93cbbe9456b4f47cbc52b19e57d35173
@@ -1149,7 +1149,7 @@ check_if_blocked(PurpleBuddy *pb)
for(l = acc->deny; l != NULL; l = l->next) {
if(!purple_utf8_strcasecmp(pb->name, (char *)l->data)) {
- purple_debug_info("bonjour", "%s has been blocked.\n", pb->name, acc->username);
+ purple_debug_info("bonjour", "%s has been blocked by %s.\n", pb->name, acc->username);
blocked = TRUE;
break;
}
============================================================
--- libpurple/protocols/gg/gg.c 30aeb5eaee935bfd9c7901e39bd3de49bb3bae2f
+++ libpurple/protocols/gg/gg.c ae21312c0c934120c4d590de681dfa9dff9c29b8
@@ -390,7 +390,7 @@ static void ggp_callback_register_accoun
goto exit_err;
}
- purple_debug_info("gg", "register_account_ok: token_id = %d; t = %s\n",
+ purple_debug_info("gg", "register_account_ok: token_id = %s; t = %s\n",
token->id, t);
h = gg_register3(email, p1, token->id, t, 0);
if (h == NULL || !(s = h->data) || !s->success) {
@@ -1324,7 +1324,7 @@ static void ggp_callback_recv(gpointer _
break;
case GG_EVENT_ACK:
purple_debug_info("gg",
- "message sent to: %ld, delivery status=%d, seq=%d\n",
+ "message sent to: %u, delivery status=%d, seq=%d\n",
ev->event.ack.recipient, ev->event.ack.status,
ev->event.ack.seq);
break;
============================================================
--- libpurple/protocols/jabber/auth.c 44dd6800aff7581f50697046ddb254b64413bff9
+++ libpurple/protocols/jabber/auth.c 9967247bae8eccc3f4f1533136851cc9d363e1bd
@@ -903,8 +903,8 @@ jabber_auth_handle_challenge(JabberStrea
}
dec_in = (char *)purple_base64_decode(enc_in, NULL);
- purple_debug(PURPLE_DEBUG_MISC, "jabber", "decoded challenge (%d): %s\n",
- strlen(dec_in), dec_in);
+ purple_debug(PURPLE_DEBUG_MISC, "jabber", "decoded challenge (%"
+ G_GSIZE_FORMAT "): %s\n", strlen(dec_in), dec_in);
parts = parse_challenge(dec_in);
@@ -982,7 +982,9 @@ jabber_auth_handle_challenge(JabberStrea
enc_out = purple_base64_encode((guchar *)response->str, response->len);
- purple_debug(PURPLE_DEBUG_MISC, "jabber", "decoded response (%d): %s\n", response->len, response->str);
+ purple_debug_misc("jabber", "decoded response (%"
+ G_GSIZE_FORMAT "): %s\n",
+ response->len, response->str);
buf = g_strdup_printf("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>", enc_out);
============================================================
--- libpurple/protocols/jabber/buddy.c fec46aa7242f2197e631a9670cbb0124b1ac01a1
+++ libpurple/protocols/jabber/buddy.c d5f219a0da85a07fead266cfbe5938da17efb469
@@ -2283,7 +2283,7 @@ static void user_search_result_cb(Jabber
row = g_list_append(row, node ? xmlnode_get_data(node) : NULL);
node = xmlnode_get_child(item, "email");
row = g_list_append(row, node ? xmlnode_get_data(node) : NULL);
- purple_debug_info("jabber", "row=%d\n", row);
+ purple_debug_info("jabber", "row=%p\n", row);
purple_notify_searchresults_row_add(results, row);
}
}
============================================================
--- libpurple/protocols/jabber/presence.c b1c201c40e38e907e2563e547d977239ad8d4bc1
+++ libpurple/protocols/jabber/presence.c 2b0f7846f1356123376598e49a935328b8921248
@@ -683,7 +683,7 @@ void jabber_presence_parse(JabberStream
jid->node ? "@" : "", jid->domain);
if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) {
if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) {
- purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%x)\n",
+ purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%p)\n",
buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
jabber_id_free(jid);
g_free(avatar_hash);
============================================================
--- libpurple/protocols/msn/directconn.c 9434160166bb8a8f10d1f283c298f951ae92ee39
+++ libpurple/protocols/msn/directconn.c 5cc7006c3dc3ea40fadd9d3c48303668e7f3c71b
@@ -300,7 +300,7 @@ read_cb(gpointer data, gint source, Purp
body_len = GUINT32_FROM_LE(body_len);
- purple_debug_info("msn", "body_len=%d\n", body_len);
+ purple_debug_info("msn", "body_len=%" G_GSIZE_FORMAT "\n", body_len);
if (body_len <= 0)
{
@@ -324,7 +324,7 @@ read_cb(gpointer data, gint source, Purp
/* Let's read the data. */
len = read(directconn->fd, body, body_len);
- purple_debug_info("msn", "len=%d\n", len);
+ purple_debug_info("msn", "len=%" G_GSIZE_FORMAT "\n", len);
}
else
{
============================================================
--- libpurple/protocols/msnp9/directconn.c aff8d9155e9215eb3dddc9748003e0a6ec04a8b6
+++ libpurple/protocols/msnp9/directconn.c e65ab6ce18b5e4f7aa0866945767254d343f5358
@@ -297,7 +297,7 @@ read_cb(gpointer data, gint source, Purp
body_len = GUINT32_FROM_LE(body_len);
- purple_debug_info("msn", "body_len=%d\n", body_len);
+ purple_debug_info("msn", "body_len=%" G_GSIZE_FORMAT "\n", body_len);
if (body_len <= 0)
{
@@ -316,7 +316,7 @@ read_cb(gpointer data, gint source, Purp
/* Let's read the data. */
len = read(directconn->fd, body, body_len);
- purple_debug_info("msn", "len=%d\n", len);
+ purple_debug_info("msn", "len=%" G_GSIZE_FORMAT "\n", len);
}
else
{
============================================================
--- libpurple/protocols/msnp9/msn.c bd6d7e84f054e7187c8245067e2ef2692785dc86
+++ libpurple/protocols/msnp9/msn.c bb0278b1641ea4342d88d96c226b19562000c8fe
@@ -1953,7 +1953,8 @@ msn_got_photo(PurpleUtilFetchUrlData *ur
else
{
char buf[1024];
- purple_debug_info("msn", "%s is %d bytes\n", photo_url_text, len);
+ purple_debug_info("msn", "%s is %" G_GSIZE_FORMAT
+ " bytes\n", photo_url_text, len);
id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
g_snprintf(buf, sizeof(buf), "<img id=\"%d\"><br>", id);
purple_notify_user_info_prepend_pair(user_info, NULL, buf);
============================================================
--- libpurple/protocols/msnp9/switchboard.c ceaf6990e754b92635d8e5559629d62e74f12936
+++ libpurple/protocols/msnp9/switchboard.c e229c1ae57fb742db488ee70c10281f16e9f66ba
@@ -1171,7 +1171,7 @@ xfr_error(MsnCmdProc *cmdproc, MsnTransa
swboard = trans->data;
- purple_debug_info("msn", "xfr_error %i for %s: trans %x, command %s, reason %i\n",
+ purple_debug_info("msn", "xfr_error %i for %s: trans %p, command %s, reason %i\n",
error, (swboard->im_user ? swboard->im_user : "(null)"), trans,
(trans->command ? trans->command : "(null)"), reason);
============================================================
--- libpurple/protocols/myspace/myspace.c 99f3feb74da38408f9df0fb7f7feb87d2b744460
+++ libpurple/protocols/myspace/myspace.c 0acceaeac9429df0a5aded75015279c3c3565175
@@ -344,10 +344,12 @@ msim_login_challenge(MsimSession *sessio
purple_connection_update_progress(session->gc, _("Reading challenge"), 1, 4);
- purple_debug_info("msim", "nc is %d bytes, decoded\n", nc_len);
+ purple_debug_info("msim", "nc is %" G_GSIZE_FORMAT
+ " bytes, decoded\n", nc_len);
if (nc_len != MSIM_AUTH_CHALLENGE_LENGTH) {
- purple_debug_info("msim", "bad nc length: %x != 0x%x\n", nc_len, MSIM_AUTH_CHALLENGE_LENGTH);
+ purple_debug_info("msim", "bad nc length: %" G_GSIZE_MODIFIER
+ "x != 0x%x\n", nc_len, MSIM_AUTH_CHALLENGE_LENGTH);
purple_connection_error_reason (session->gc,
PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
_("Unexpected challenge length from server"));
@@ -493,8 +495,8 @@ msim_compute_login_response(const gchar
if (data_out_len != data_len) {
purple_debug_info("msim", "msim_compute_login_response: "
- "data length mismatch: %d != %d\n",
- data_out_len, data_len);
+ "data length mismatch: %" G_GSIZE_FORMAT " != %"
+ G_GSIZE_FORMAT "\n", data_out_len, data_len);
}
#ifdef MSIM_DEBUG_LOGIN_CHALLENGE
@@ -764,7 +766,7 @@ msim_incoming_action(MsimSession *sessio
username = msim_msg_get_string(msg, "_username");
g_return_val_if_fail(username != NULL, FALSE);
- purple_debug_info("msim", "msim_incoming_action: action <%s> from <%d>\n",
+ purple_debug_info("msim", "msim_incoming_action: action <%s> from <%s>\n",
msg_text, username);
if (g_str_equal(msg_text, "%typing%")) {
@@ -2796,7 +2798,7 @@ msim_add_contact_from_server_cb(MsimSess
guint uid;
contact_info = (MsimMessage *)data;
- purple_debug_info("msim_add_contact_from_server_cb", "contact_info addr=%X\n", contact_info);
+ purple_debug_info("msim_add_contact_from_server_cb", "contact_info addr=%p\n", contact_info);
uid = msim_msg_get_integer(contact_info, "ContactID");
if (!user_lookup_info) {
@@ -2879,7 +2881,7 @@ msim_add_contact_from_server(MsimSession
uid_str = g_strdup_printf("%d", uid);
purple_debug_info("msim_add_contact_from_server",
- "contact_info addr=%X\n", contact_info);
+ "contact_info addr=%p\n", contact_info);
msim_lookup_user(session, uid_str, msim_add_contact_from_server_cb, (gpointer)msim_msg_clone(contact_info));
g_free(uid_str);
} else {
============================================================
--- libpurple/protocols/myspace/user.c 2d3226fb37480df5657d5a9fa564c58a22bcd5b3
+++ libpurple/protocols/myspace/user.c 54ff806ca1396bc3558e638400430dc2c2b37571
@@ -543,7 +543,7 @@ msim_downloaded_buddy_icon(PurpleUtilFet
user = (MsimUser *)user_data;
purple_debug_info("msim_downloaded_buddy_icon",
- "Downloaded %d bytes\n", len);
+ "Downloaded %" G_GSIZE_FORMAT " bytes\n", len);
if (!url_text) {
purple_debug_info("msim_downloaded_buddy_icon",
============================================================
--- libpurple/protocols/oscar/family_buddy.c 5cc2eddf9c0890a6e44351d358d50b268036aabf
+++ libpurple/protocols/oscar/family_buddy.c 124b859676711289ab7502076e731e955a5afb7a
@@ -139,7 +139,8 @@ aim_buddylist_set(OscarData *od, FlapCon
return -EINVAL;
for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
- purple_debug_misc("oscar", "---adding: %s (%d)\n", tmpptr, strlen(tmpptr));
+ purple_debug_misc("oscar", "---adding: %s (%" G_GSIZE_FORMAT
+ ")\n", tmpptr, strlen(tmpptr));
len += 1 + strlen(tmpptr);
tmpptr = strtok(NULL, "&");
}
@@ -153,7 +154,8 @@ aim_buddylist_set(OscarData *od, FlapCon
for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
- purple_debug_misc("oscar", "---adding: %s (%d)\n", tmpptr, strlen(tmpptr));
+ purple_debug_misc("oscar", "---adding: %s (%" G_GSIZE_FORMAT
+ ")\n", tmpptr, strlen(tmpptr));
byte_stream_put8(&frame->data, strlen(tmpptr));
byte_stream_putstr(&frame->data, tmpptr);
============================================================
--- libpurple/protocols/oscar/family_chatnav.c 1570a3a72f707fc111b7aac97e4635b5d46ddef1
+++ libpurple/protocols/oscar/family_chatnav.c ebd5b2409e1ce2cc36e6a47bcf204ba56fc2c52c
@@ -38,7 +38,7 @@ error(OscarData *od, FlapConnection *con
GSList *tlvlist;
if (!(snac2 = aim_remsnac(od, snac->id))) {
- purple_debug_warning("oscar", "chatnav error: received response to unknown request (%08lx)\n", snac->id);
+ purple_debug_warning("oscar", "chatnav error: received response to unknown request (%08x)\n", snac->id);
return 0;
}
@@ -455,7 +455,7 @@ parseinfo(OscarData *od, FlapConnection
int ret = 0;
if (!(snac2 = aim_remsnac(od, snac->id))) {
- purple_debug_misc("oscar", "faim: chatnav_parse_info: received response to unknown request! (%08lx)\n", snac->id);
+ purple_debug_misc("oscar", "faim: chatnav_parse_info: received response to unknown request! (%08x)\n", snac->id);
return 0;
}
============================================================
--- libpurple/protocols/oscar/family_icq.c 36960db6d17bdb9549b1eae60bc955af110c074f
+++ libpurple/protocols/oscar/family_icq.c e8c57aec086ccad25bd2e0fe98cfaf4eaac8d7c9
@@ -558,7 +558,7 @@ icqresponse(OscarData *od, FlapConnectio
cmd = byte_stream_getle16(&qbs);
reqid = byte_stream_getle16(&qbs);
- purple_debug_misc("oscar", "icq response: %d bytes, %ld, 0x%04x, 0x%04x\n", cmdlen, ouruin, cmd, reqid);
+ purple_debug_misc("oscar", "icq response: %d bytes, %u, 0x%04x, 0x%04x\n", cmdlen, ouruin, cmd, reqid);
if (cmd == 0x0041) { /* offline message */
#ifdef OLDSTYLE_ICQ_OFFLINEMSGS
============================================================
--- libpurple/protocols/oscar/family_oservice.c b44b403eb25d37f7174f164dfc1e31c29ccabbd7
+++ libpurple/protocols/oscar/family_oservice.c 896a2f298fb653ee70d2a4ac1ec2180405041ad0
@@ -922,7 +922,7 @@ memrequest(OscarData *od, FlapConnection
modname = aim_tlv_getstr(tlvlist, 0x0001, 1);
- purple_debug_info("oscar", "Got memory request for data at 0x%08lx (%d bytes) of requested %s\n", offset, len, modname ? modname : "aim.exe");
+ purple_debug_info("oscar", "Got memory request for data at 0x%08x (%u bytes) of requested %s\n", offset, len, modname ? modname : "aim.exe");
if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
ret = userfunc(od, conn, frame, offset, len, modname);
============================================================
--- libpurple/protocols/oscar/family_userlookup.c cadf003b22c9c89f2a6acaeba4170aa1da240f31
+++ libpurple/protocols/oscar/family_userlookup.c 30746d30707df77e27888faf85e6c7de78afd4e0
@@ -40,7 +40,7 @@ static int error(OscarData *od, FlapConn
/* XXX the modules interface should have already retrieved this for us */
if (!(snac2 = aim_remsnac(od, snac->id))) {
- purple_debug_misc("oscar", "search error: couldn't get a snac for 0x%08lx\n", snac->id);
+ purple_debug_misc("oscar", "search error: couldn't get a snac for 0x%08x\n", snac->id);
return 0;
}
============================================================
--- libpurple/protocols/oscar/flap_connection.c 215d71c37bda1cba2f2bdc2c2904a4606d437fd7
+++ libpurple/protocols/oscar/flap_connection.c 7a4abab5b2507dd0b25ae272ae8ad81606a1e511
@@ -753,7 +753,7 @@ parse_flap(OscarData *od, FlapConnection
{
/* Error! */
purple_debug_warning("oscar", "Expecting FLAP version "
- "0x00000001 but received FLAP version %08lx. Closing connection.\n",
+ "0x00000001 but received FLAP version %08x. Closing connection.\n",
flap_version);
flap_connection_schedule_destroy(conn,
OSCAR_DISCONNECT_INVALID_DATA, NULL);
============================================================
--- libpurple/protocols/oscar/oscar.c 9920358c9c85b4708b5e4bbf2c5f8f4ff270d21b
+++ libpurple/protocols/oscar/oscar.c 2ddba48470ece7d5ec4557d44cc9a247a2c9d31d
@@ -417,7 +417,7 @@ purple_plugin_oscar_decode_im_part(Purpl
gchar *ret = NULL;
const gchar *charsetstr1, *charsetstr2;
- purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%hd\n", charset, charsubset, datalen);
+ purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%" G_GSIZE_FORMAT "\n", charset, charsubset, datalen);
if ((datalen == 0) || (data == NULL))
return NULL;
@@ -2014,8 +2014,8 @@ static int incomingim_chan1(OscarData *o
gconstpointer data = purple_imgstore_get_data(img);
size_t len = purple_imgstore_get_size(img);
purple_debug_info("oscar",
- "Sending buddy icon to %s (%d bytes)\n",
- userinfo->sn, len);
+ "Sending buddy icon to %s (%" G_GSIZE_FORMAT " bytes)\n",
+ userinfo->sn, len);
aim_im_sendch2_icon(od, userinfo->sn, data, len,
purple_buddy_icons_get_account_icon_timestamp(account),
aimutil_iconsum(data, len));
============================================================
--- libpurple/protocols/qq/qq_proxy.c 133519423d445431dd348f0a156d5f2ba12121a9
+++ libpurple/protocols/qq/qq_proxy.c 03d9059bebc14b3485619da290acc51e3361c1dc
@@ -294,10 +294,10 @@ static gint _qq_proxy_none(struct PHB *p
* The connection is established asynchronously.
*/
if ((errno == EINPROGRESS) || (errno == EINTR)) {
- purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Connect in asynchronous mode.\n");
+ purple_debug_warning("QQ", "Connect in asynchronous mode.\n");
phb->inpa = purple_input_add(fd, PURPLE_INPUT_WRITE, no_one_calls, phb);
} else {
- purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Connection failed: %d\n", g_strerror(errno));
+ purple_debug_error("QQ", "Connection failed: %s\n", g_strerror(errno));
close(fd);
return -1;
} /* if errno */
============================================================
--- libpurple/protocols/sametime/sametime.c a7cc50e00c6137944213bdf41474ec8e5ac494f4
+++ libpurple/protocols/sametime/sametime.c 6d31298db62cd036e2597653eaa345dcbbabb21d
@@ -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;
- int ret = 0;
+ ssize_t ret = 0;
int err = 0;
pd = mwSession_getClientData(session);
@@ -413,7 +413,8 @@ 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 %i, %i bytes left unwritten\n", ret, len);
+ DEBUG_ERROR("write returned %" G_GSIZE_FORMAT ", %" G_GSIZE_FORMAT
+ " bytes left unwritten\n", ret, len);
purple_connection_error_reason(pd->gc,
PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
_("Connection closed (writing)"));
============================================================
--- libpurple/protocols/yahoo/yahoo_aliases.c ed2a609c354f204e7677be611301ff6652d1a7d1
+++ libpurple/protocols/yahoo/yahoo_aliases.c 59779f875ea95c7204d791e7f9f9efecf405b806
@@ -79,7 +79,8 @@ yahoo_fetch_aliases_cb(PurpleUtilFetchUr
purple_debug_error("yahoo_aliases","Badly formed XML\n");
return;
}
- purple_debug_info("yahoo", "Fetched %i bytes of alias data\n", len);
+ purple_debug_info("yahoo", "Fetched %" G_GSIZE_FORMAT
+ " bytes of alias data\n", len);
/* Loop around and around and around until we have gone through all the received aliases */
for(item = xmlnode_get_child(contacts, "ct"); item; item = xmlnode_get_next_twin(item)) {
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.c 1054e522508747778369adbb833ec8b14312f8aa
+++ libpurple/protocols/yahoo/yahoo_packet.c 95f72b1b652818f7bde0cf587b77eca0506e5086
@@ -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;
- int ret;
+ ssize_t ret;
guchar *data;
if (yd->fd < 0)
@@ -365,7 +365,8 @@ int yahoo_packet_send(struct yahoo_packe
if (ret < 0 && errno == EAGAIN)
ret = 0;
else if (ret <= 0) {
- purple_debug_warning("yahoo", "Only wrote %d of %d bytes!\n", ret, len);
+ purple_debug_warning("yahoo", "Only wrote %" G_GSSIZE_FORMAT
+ " of %" G_GSIZE_FORMAT " bytes!\n", ret, len);
g_free(data);
return ret;
}
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c 951dbd6d885ca9a549a1dc5ba47a8261ad2a72fb
+++ libpurple/protocols/yahoo/yahoo_profile.c aece8205299da37a566e01ba6f830965ffc26869
@@ -1051,7 +1051,8 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
purple_debug_info("yahoo", "Error getting %s: %s\n",
photo_url_text, url_text);
} else {
- purple_debug_info("yahoo", "%s is %d bytes\n", photo_url_text, len);
+ purple_debug_info("yahoo", "%s is %" G_GSIZE_FORMAT
+ " bytes\n", photo_url_text, len);
id = purple_imgstore_add_with_id(g_memdup(url_text, len), len, NULL);
tmp = g_strdup_printf("<img id=\"%d\"><br>", id);
============================================================
--- libpurple/proxy.c 685db0075d95b756a8c31961210d6164a966d609
+++ libpurple/proxy.c d53c752c669e4d1656ac61673f64cd509bdaa081
@@ -1126,7 +1126,8 @@ s5_ensure_buffer_length(PurpleProxyConne
if(connect_data->read_len < len) {
if(connect_data->read_buf_len < len) {
/* it's not just that we haven't read enough, it's that we haven't tried to read enough yet */
- purple_debug_info("s5", "reallocing from %d to %d\n", connect_data->read_buf_len, len);
+ purple_debug_info("s5", "reallocing from %" G_GSIZE_FORMAT
+ " to %d\n", connect_data->read_buf_len, len);
connect_data->read_buf_len = len;
connect_data->read_buffer = g_realloc(connect_data->read_buffer, connect_data->read_buf_len);
}
============================================================
--- libpurple/util.c 510a6d621b69ed995a69c3cedc74560ced04fb21
+++ libpurple/util.c 351b7da3cff934b95fe4b7685ac065a3ae54bcfd
@@ -3710,7 +3710,7 @@ parse_content_len(const char *data, size
*/
if (p && g_strstr_len(p, data_len - (p - data), "\n")) {
sscanf(p, "%" G_GSIZE_FORMAT, &content_len);
- purple_debug_misc("util", "parsed %u\n", content_len);
+ purple_debug_misc("util", "parsed %" G_GSIZE_FORMAT "\n", content_len);
}
return content_len;
@@ -3787,7 +3787,7 @@ url_fetch_recv_cb(gpointer url_data, gin
new_data = g_try_malloc(content_len);
if(new_data == NULL) {
purple_debug_error("util",
- "Failed to allocate %u bytes: %s\n",
+ "Failed to allocate %" G_GSIZE_FORMAT " bytes: %s\n",
content_len, g_strerror(errno));
purple_util_fetch_url_error(gfud,
_("Unable to allocate enough memory to hold "
============================================================
--- pidgin/gtkmain.c 84c6d474edfca274f1a6b7900674454bc93858bc
+++ pidgin/gtkmain.c ba2f20f164c96e9a6f463f1468847a2cf83b8006
@@ -240,7 +240,7 @@ ui_main(void)
icons = g_list_append(icons,icon);
} else {
purple_debug_error("ui_main",
- "Failed to load the default window icon (%spx version)!\n", icon_sizes[i]);
+ "Failed to load the default window icon (%spx version)!\n", icon_sizes[i].dir);
}
}
if(NULL == icons) {
More information about the Commits
mailing list