changeset
Backport more warning fixes for prpls from default
Tue, 06 May 2014 14:58:47 +0200
- author
- Tomasz Wasilczyk <twasilczyk@pidgin.im>
- date
- Tue, 06 May 2014 14:58:47 +0200
- branch
- release-2.x.y
- changeset 35983
- 029ab6fae0e6
- parent 35982
- 091d710e14c3
- child 35984
- f7d395700c8b
Backport more warning fixes for prpls from default
--- a/libpurple/protocols/bonjour/jabber.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/bonjour/jabber.c Tue May 06 14:58:47 2014 +0200 @@ -149,7 +149,6 @@ xmlnode *body_node, *html_node, *events_node; PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(pb)); gchar *body = NULL; - gboolean composing_event = FALSE; body_node = xmlnode_get_child(message_node, "body"); html_node = xmlnode_get_child(message_node, "html"); @@ -161,8 +160,10 @@ events_node = xmlnode_get_child_with_namespace(message_node, "x", "jabber:x:event"); if (events_node != NULL) { +#if 0 if (xmlnode_get_child(events_node, "composing") != NULL) composing_event = TRUE; +#endif if (xmlnode_get_child(events_node, "id") != NULL) { /* The user is just typing */ /* TODO: Deal with typing notification */
--- a/libpurple/protocols/mxit/http.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/mxit/http.c Tue May 06 14:58:47 2014 +0200 @@ -104,7 +104,9 @@ int len; char* tmp; int res; +#if 0 char* next; +#endif purple_debug_info( MXIT_PLUGIN_ID, "mxit_cb_http_read\n" ); @@ -123,7 +125,9 @@ } buf[buflen+len] = '\0'; -//nextpacket: +#if 0 +nextpacket: +#endif #ifdef DEBUG_HTTP purple_debug_info( MXIT_PLUGIN_ID, "HTTP POST READ 1: (%i)\n", len ); @@ -188,7 +192,9 @@ } else if ( buflen > ( ( body - buf ) + bodylen ) ) { /* we have a second packet here */ +#if 0 next = body + bodylen; +#endif session->rx_res = 0; } else {
--- a/libpurple/protocols/myspace/user.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/myspace/user.c Tue May 06 14:58:47 2014 +0200 @@ -619,14 +619,16 @@ MsimMessage *body; guint rid; - gint cmd,dsn,uid,lid,code; + gint cmd,dsn,lid,code; /* \persistr\\cmd\258\dsn\9\uid\204084363\lid\14\rid\369\body\UserName=TheAlbinoRhino1.Code=0\final\ */ purple_debug_info("msim","username_is_set made\n"); cmd = msim_msg_get_integer(userinfo, "cmd"); dsn = msim_msg_get_integer(userinfo, "dsn"); +#if 0 uid = msim_msg_get_integer(userinfo, "uid"); +#endif lid = msim_msg_get_integer(userinfo, "lid"); body = msim_msg_get_dictionary(userinfo, "body"); errmsg = _("An error occurred while trying to set the username. "
--- a/libpurple/protocols/oscar/family_auth.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_auth.c Tue May 06 14:58:47 2014 +0200 @@ -563,7 +563,6 @@ { FlapConnection *conn; FlapFrame *frame; - aim_snacid_t snacid; int len; if (!od || !(conn = flap_connection_getbytype_all(od, SNAC_FAMILY_AUTH)) || !securid) @@ -573,7 +572,7 @@ frame = flap_frame_new(od, 0x02, 10+2+len); - snacid = aim_cachesnac(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, NULL, 0); + /* aim_snacid_t snacid = */ aim_cachesnac(od, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0x0000, NULL, 0); aim_putsnac(&frame->data, SNAC_FAMILY_AUTH, SNAC_SUBTYPE_AUTH_SECURID_RESPONSE, 0); byte_stream_put16(&frame->data, len);
--- a/libpurple/protocols/oscar/family_bart.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_bart.c Tue May 06 14:58:47 2014 +0200 @@ -73,12 +73,10 @@ { int ret = 0; aim_rxcallback_t userfunc; - guint16 something, somethingelse; - guint8 onemorething; - something = byte_stream_get16(bs); - somethingelse = byte_stream_get16(bs); - onemorething = byte_stream_get8(bs); + byte_stream_get16(bs); + byte_stream_get16(bs); + byte_stream_get8(bs); if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) ret = userfunc(od, conn, frame); @@ -139,11 +137,11 @@ int ret = 0; aim_rxcallback_t userfunc; char *bn; - guint16 flags, iconlen; + guint16 iconlen; guint8 iconcsumtype, iconcsumlen, *iconcsum, *icon; bn = byte_stream_getstr(bs, byte_stream_get8(bs)); - flags = byte_stream_get16(bs); + byte_stream_get16(bs); /* flags */ iconcsumtype = byte_stream_get8(bs); iconcsumlen = byte_stream_get8(bs); iconcsum = byte_stream_getraw(bs, iconcsumlen);
--- a/libpurple/protocols/oscar/family_chatnav.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_chatnav.c Tue May 06 14:58:47 2014 +0200 @@ -224,11 +224,8 @@ * 2 Exchange creation allowed * */ - if (aim_tlv_gettlv(innerlist, 0x00d5, 1)) { - guint8 createperms; - - createperms = aim_tlv_get8(innerlist, 0x00d5, 1); - } + if (aim_tlv_gettlv(innerlist, 0x00d5, 1)) + aim_tlv_get8(innerlist, 0x00d5, 1); /* createperms */ /* * Type 0x00d6: Character Set (First Time)
--- a/libpurple/protocols/oscar/family_icbm.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_icbm.c Tue May 06 14:58:47 2014 +0200 @@ -1807,13 +1807,12 @@ */ static int msgack(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs) { - guint16 ch; guchar *cookie; char *bn; int ret = 0; cookie = byte_stream_getraw(bs, 8); - ch = byte_stream_get16(bs); + byte_stream_get16(bs); /* ch */ bn = byte_stream_getstr(bs, byte_stream_get8(bs)); purple_debug_info("oscar", "Sent message to %s.\n", bn);
--- a/libpurple/protocols/oscar/family_locate.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_locate.c Tue May 06 14:58:47 2014 +0200 @@ -958,8 +958,7 @@ /* * My instance number. */ - guint8 instance_number; - instance_number = byte_stream_get8(bs); + byte_stream_get8(bs); } else if (type == 0x0019) { /*
--- a/libpurple/protocols/oscar/family_oservice.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/family_oservice.c Tue May 06 14:58:47 2014 +0200 @@ -764,6 +764,9 @@ /* This is frivolous. (Thank you SmarterChild.) */ vercount = byte_stream_bytes_left(bs)/4; + + /* XXX: vercount probably should be used for reading versions. */ + (void)vercount; versions = byte_stream_getraw(bs, byte_stream_bytes_left(bs)); g_free(versions);
--- a/libpurple/protocols/oscar/oscar.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/oscar/oscar.c Tue May 06 14:58:47 2014 +0200 @@ -2175,11 +2175,11 @@ PurpleAccount *account = purple_connection_get_account(gc); char *buf; va_list ap; - guint16 chan, nummissed, reason; + guint16 nummissed, reason; aim_userinfo_t *userinfo; va_start(ap, fr); - chan = (guint16)va_arg(ap, unsigned int); + va_arg(ap, unsigned int); /* guint16 chan */ userinfo = va_arg(ap, aim_userinfo_t *); nummissed = (guint16)va_arg(ap, unsigned int); reason = (guint16)va_arg(ap, unsigned int); @@ -2654,12 +2654,12 @@ PurpleConnection *gc = od->gc; va_list ap; char *bn; - guint8 iconcsumtype, *iconcsum, *icon; + guint8 *iconcsum, *icon; guint16 iconcsumlen, iconlen; va_start(ap, fr); bn = va_arg(ap, char *); - iconcsumtype = va_arg(ap, int); + va_arg(ap, int); /* iconsumtype */ iconcsum = va_arg(ap, guint8 *); iconcsumlen = va_arg(ap, int); icon = va_arg(ap, guint8 *); @@ -2964,14 +2964,13 @@ gchar *text; va_list ap; char *msg, *url; - guint16 wid, hei, delay; va_start(ap, fr); msg = va_arg(ap, char *); url = va_arg(ap, char *); - wid = (guint16) va_arg(ap, int); - hei = (guint16) va_arg(ap, int); - delay = (guint16) va_arg(ap, int); + va_arg(ap, int); /* guint16 wid */ + va_arg(ap, int); /* guint16 hei */ + va_arg(ap, int); /* guint16 delay */ va_end(ap); text = g_strdup_printf("%s<br><a href=\"%s\">%s</a>", msg, url, url); @@ -3882,8 +3881,6 @@ guint32 tmp; PurpleStoredImage *img; va_list ap; - guint16 fmtver, numitems; - guint32 timestamp; guint16 deny_entry_type = aim_ssi_getdenyentrytype(od); gc = od->gc; @@ -3891,9 +3888,9 @@ account = purple_connection_get_account(gc); va_start(ap, fr); - fmtver = (guint16)va_arg(ap, int); - numitems = (guint16)va_arg(ap, int); - timestamp = va_arg(ap, guint32); + va_arg(ap, int); /* guint16 fmtver */ + va_arg(ap, int); /* guint16 numitems */ + va_arg(ap, guint32); /* timestamp */ va_end(ap); /* Don't attempt to re-request our buddy list later */ @@ -4276,14 +4273,14 @@ static int purple_ssi_authgiven(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { PurpleConnection *gc = od->gc; va_list ap; - char *bn, *msg; + char *bn; gchar *dialog_msg, *nombre; struct name_data *data; PurpleBuddy *buddy; va_start(ap, fr); bn = va_arg(ap, char *); - msg = va_arg(ap, char *); + va_arg(ap, char *); /* msg */ va_end(ap); purple_debug_info("oscar",
--- a/libpurple/protocols/sametime/sametime.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/sametime/sametime.c Tue May 06 14:58:47 2014 +0200 @@ -1336,13 +1336,11 @@ static void blist_node_menu_cb(PurpleBlistNode *node, GList **menu, struct mwPurplePluginData *pd) { const char *owner; - PurpleGroup *group; PurpleAccount *acct; PurpleMenuAction *act; /* we only want groups */ if(! PURPLE_BLIST_NODE_IS_GROUP(node)) return; - group = (PurpleGroup *) node; acct = purple_connection_get_account(pd->gc); g_return_if_fail(acct != NULL); @@ -2027,21 +2025,12 @@ static void mw_conf_peer_joined(struct mwConference *conf, struct mwLoginInfo *peer) { - struct mwServiceConference *srvc; - struct mwSession *session; - struct mwPurplePluginData *pd; - PurpleConnection *gc; PurpleConvChat *g_conf; const char *n = mwConference_getName(conf); DEBUG_INFO("%s joined conf %s\n", NSTR(peer->user_id), NSTR(n)); - srvc = mwConference_getService(conf); - session = mwService_getSession(MW_SERVICE(srvc)); - pd = mwSession_getClientData(session); - gc = pd->gc; - g_conf = mwConference_getClientData(conf); g_return_if_fail(g_conf != NULL); @@ -2053,21 +2042,12 @@ static void mw_conf_peer_parted(struct mwConference *conf, struct mwLoginInfo *peer) { - struct mwServiceConference *srvc; - struct mwSession *session; - struct mwPurplePluginData *pd; - PurpleConnection *gc; PurpleConvChat *g_conf; const char *n = mwConference_getName(conf); DEBUG_INFO("%s left conf %s\n", NSTR(peer->user_id), NSTR(n)); - srvc = mwConference_getService(conf); - session = mwService_getSession(MW_SERVICE(srvc)); - pd = mwSession_getClientData(session); - gc = pd->gc; - g_conf = mwConference_getClientData(conf); g_return_if_fail(g_conf != NULL); @@ -3047,21 +3027,12 @@ static void mw_place_peerJoined(struct mwPlace *place, const struct mwIdBlock *peer) { - struct mwServicePlace *srvc; - struct mwSession *session; - struct mwPurplePluginData *pd; - PurpleConnection *gc; PurpleConversation *gconf; const char *n = mwPlace_getName(place); DEBUG_INFO("%s joined place %s\n", NSTR(peer->user), NSTR(n)); - srvc = mwPlace_getService(place); - session = mwService_getSession(MW_SERVICE(srvc)); - pd = mwSession_getClientData(session); - gc = pd->gc; - gconf = mwPlace_getClientData(place); g_return_if_fail(gconf != NULL); @@ -3072,21 +3043,12 @@ static void mw_place_peerParted(struct mwPlace *place, const struct mwIdBlock *peer) { - struct mwServicePlace *srvc; - struct mwSession *session; - struct mwPurplePluginData *pd; - PurpleConnection *gc; PurpleConversation *gconf; const char *n = mwPlace_getName(place); DEBUG_INFO("%s left place %s\n", NSTR(peer->user), NSTR(n)); - srvc = mwPlace_getService(place); - session = mwService_getSession(MW_SERVICE(srvc)); - pd = mwSession_getClientData(session); - gc = pd->gc; - gconf = mwPlace_getClientData(place); g_return_if_fail(gconf != NULL);
--- a/libpurple/protocols/silc/ops.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/silc/ops.c Tue May 06 14:58:47 2014 +0200 @@ -121,7 +121,6 @@ SilcMime p; const char *mtype; SilcDList parts = silc_mime_get_multiparts(mime, &mtype); - SilcBool ret; if (!strcmp(mtype, "mixed")) { /* Contains multiple messages */ @@ -1169,7 +1168,7 @@ case SILC_COMMAND_WHOIS: { - SilcUInt32 idle, *user_modes; + SilcUInt32 *user_modes; SilcDList channels; SilcClientEntry client_entry; char tmp[1024], *tmp2; @@ -1189,7 +1188,7 @@ (void)va_arg(ap, char *); channels = va_arg(ap, SilcDList); (void)va_arg(ap, SilcUInt32); - idle = va_arg(ap, SilcUInt32); + va_arg(ap, SilcUInt32); /* idle */ (void)va_arg(ap, unsigned char *); user_modes = va_arg(ap, SilcUInt32 *);
--- a/libpurple/protocols/silc/silc.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/silc/silc.c Tue May 06 14:58:47 2014 +0200 @@ -400,7 +400,7 @@ } /* Perform SILC Key Exchange. */ - silc_client_key_exchange(sg->client, ¶ms, sg->public_key, + silc_client_key_exchange(client, ¶ms, sg->public_key, sg->private_key, stream, SILC_CONN_SERVER, silcpurple_connect_cb, gc);
--- a/libpurple/protocols/silc/wb.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/silc/wb.c Tue May 06 14:58:47 2014 +0200 @@ -105,11 +105,9 @@ PurpleWhiteboard *silcpurple_wb_init(SilcPurple sg, SilcClientEntry client_entry) { - SilcClientConnection conn; PurpleWhiteboard *wb; SilcPurpleWb wbs; - conn = sg->conn; wb = purple_whiteboard_get_session(sg->account, client_entry->nickname); if (!wb) wb = purple_whiteboard_create(sg->account, client_entry->nickname, 0);
--- a/libpurple/protocols/yahoo/libymsg.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/yahoo/libymsg.c Tue May 06 14:58:47 2014 +0200 @@ -650,7 +650,6 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt) { GSList *l = pkt->hash; - gboolean export = FALSE; gboolean got_serv_list = FALSE; YahooFriend *f = NULL; PurpleAccount *account = purple_connection_get_account(gc); @@ -754,7 +753,6 @@ } b = purple_buddy_new(account, norm_bud, NULL); purple_blist_add_buddy(b, NULL, g, NULL); - export = TRUE; } yahoo_do_group_check(account, ht, norm_bud, grp); @@ -1937,7 +1935,6 @@ struct yahoo_auth_data *auth_data = user_data; PurpleConnection *gc = auth_data->gc; YahooData *yd = purple_connection_get_protocol_data(gc); - gboolean try_login_on_error = FALSE; purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n"); @@ -2025,7 +2022,9 @@ default: /* if we have everything we need, why not try to login irrespective of response */ if((crumb != NULL) && (yd->cookie_y != NULL) && (yd->cookie_t != NULL)) { +#if 0 try_login_on_error = TRUE; +#endif break; } error_reason = g_strdup(_("Unknown error")); @@ -2213,13 +2212,13 @@ static void yahoo_process_auth(PurpleConnection *gc, struct yahoo_packet *pkt) { char *seed = NULL; - char *sn = NULL; GSList *l = pkt->hash; int m = 0; gchar *buf; while (l) { struct yahoo_pair *pair = l->data; + /* (pair->key == 1) -> sn */ if (pair->key == 94) { if (g_utf8_validate(pair->value, -1, NULL)) { seed = pair->value; @@ -2227,17 +2226,9 @@ purple_debug_warning("yahoo", "yahoo_process_auth " "got non-UTF-8 string for key %d\n", pair->key); } + } else if (pair->key == 13) { + m = atoi(pair->value); } - if (pair->key == 1) { - if (g_utf8_validate(pair->value, -1, NULL)) { - sn = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_auth " - "got non-UTF-8 string for key %d\n", pair->key); - } - } - if (pair->key == 13) - m = atoi(pair->value); l = l->next; } @@ -2298,7 +2289,6 @@ PurpleBuddy *b; GSList *l; gchar *who = NULL; - gchar *me = NULL; gchar buf[BUF_LONG]; gboolean ignore = TRUE; gint status = 0; @@ -2314,14 +2304,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 1: - if (g_utf8_validate(pair->value, -1, NULL)) { - me = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_ignore " - "got non-UTF-8 string for key %d\n", pair->key); - } - break; + /* 1 -> me */ case 13: /* 1 == ignore, 2 == unignore */ ignore = (strtol(pair->value, NULL, 10) == 1);
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Tue May 06 14:58:47 2014 +0200 @@ -740,7 +740,6 @@ char *message = NULL; char *command = NULL; char *imv = NULL; - char *unknown = NULL; /* Get all the necessary values from this new packet */ while(l != NULL) @@ -797,12 +796,6 @@ } break; case 64: /* Not sure, but it does vary with initialization of Doodle */ - if (g_utf8_validate(pair->value, -1, NULL)) { - unknown = pair->value; /* So, I'll keep it (for a little while atleast) */ - } else { - purple_debug_warning("yahoo", "yahoo_process_p2pfilexfer " - "got non-UTF-8 string for key %d\n", pair->key); - } break; } @@ -828,11 +821,9 @@ void yahoo_process_filetransfer(PurpleConnection *gc, struct yahoo_packet *pkt) { char *from = NULL; - char *to = NULL; char *msg = NULL; char *url = NULL; char *imv = NULL; - long expires = 0; PurpleXfer *xfer; YahooData *yd; struct yahoo_xfer_data *xfer_data; @@ -855,13 +846,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 5: - if (g_utf8_validate(pair->value, -1, NULL)) { - to = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_filetransfer " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 5: /* to */ break; case 14: if (g_utf8_validate(pair->value, -1, NULL)) { @@ -879,8 +864,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 38: - expires = strtol(pair->value, NULL, 10); + case 38: /* expires */ break; case 27: filename = pair->value; @@ -1658,7 +1642,6 @@ void yahoo_process_filetrans_15(PurpleConnection *gc, struct yahoo_packet *pkt) { char *from = NULL; - char *to = NULL; char *imv = NULL; long val_222 = 0L; PurpleXfer *xfer; @@ -1688,13 +1671,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 5: - if (g_utf8_validate(pair->value, -1, NULL)) { - to = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_filetrans_15 " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 5: /* to */ break; case 265: if (g_utf8_validate(pair->value, -1, NULL)) { @@ -1870,15 +1847,12 @@ void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *pkt) { - char *from = NULL; - char *to = NULL; char *url = NULL; long val_249 = 0; long val_66 = 0; PurpleXfer *xfer; YahooData *yd; struct yahoo_xfer_data *xfer_data; - char *filename = NULL; char *xfer_peer_idstring = NULL; char *xfer_idstring_for_relay = NULL; GSList *l; @@ -1891,11 +1865,9 @@ struct yahoo_pair *pair = l->data; switch (pair->key) { - case 4: - from = pair->value; + case 4: /* from */ break; - case 5: - to = pair->value; + case 5: /* to */ break; case 265: if (g_utf8_validate(pair->value, -1, NULL)) { @@ -1905,8 +1877,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 27: - filename = pair->value; + case 27: /* filename */ break; case 66: val_66 = strtol(pair->value, NULL, 10);
--- a/libpurple/protocols/yahoo/yahoo_picture.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/yahoo/yahoo_picture.c Tue May 06 14:58:47 2014 +0200 @@ -73,7 +73,7 @@ { YahooData *yd; GSList *l = pkt->hash; - char *who = NULL, *us = NULL; + char *who = NULL; gboolean got_icon_info = FALSE, send_icon_info = FALSE; char *url = NULL; int checksum = 0; @@ -91,13 +91,7 @@ "got non-UTF-8 string for key %d\n", pair->key); } break; - case 5: - if (g_utf8_validate(pair->value, -1, NULL)) { - us = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_picture " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 5: /* us */ break; case 13: { int tmp;
--- a/libpurple/protocols/yahoo/yahoochat.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/yahoo/yahoochat.c Tue May 06 14:58:47 2014 +0200 @@ -499,7 +499,6 @@ GList *roomies = NULL; char *room = NULL; char *topic = NULL; - char *someid, *someotherid, *somebase64orhashosomething, *somenegativenumber; if (pkt->status == -1) { /* We can't join */ @@ -535,39 +534,15 @@ g_free(topic); topic = yahoo_string_decode(gc, pair->value, TRUE); break; - case 128: - if (g_utf8_validate(pair->value, -1, NULL)) { - someid = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_chat_join " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 128: /* some id */ break; case 108: /* number of joiners */ break; - case 129: - if (g_utf8_validate(pair->value, -1, NULL)) { - someotherid = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_chat_join " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 129: /* some other id */ break; - case 130: - if (g_utf8_validate(pair->value, -1, NULL)) { - somebase64orhashosomething = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_chat_join " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 130: /* some base64 or hash or something */ break; - case 126: - if (g_utf8_validate(pair->value, -1, NULL)) { - somenegativenumber = pair->value; - } else { - purple_debug_warning("yahoo", "yahoo_process_chat_join " - "got non-UTF-8 string for key %d\n", pair->key); - } + case 126: /* some negative number */ break; case 13: /* this is 1. maybe its the type of room? (normal, user created, private, etc?) */ break;
--- a/libpurple/protocols/zephyr/ZParseNot.c Tue May 06 13:56:02 2014 +0200 +++ b/libpurple/protocols/zephyr/ZParseNot.c Tue May 06 14:58:47 2014 +0200 @@ -120,6 +120,9 @@ Z_debug ("ZParseNotice: bad packet from %s/%d (line %d)", inet_ntoa (notice->z_uid.zuid_addr.s_addr), notice->z_port, lineno); +#else + /* We won't use lineno anywhere else, so let's silence a warning. */ + (void)lineno; #endif #else badpkt:
