Mercurial > pidgin.yaz
changeset 14259:0ac0f16aa006
[gaim-migrate @ 16941]
silence some warnings by casting several things to (char *) that are actually unsigned char *'s.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Mon, 21 Aug 2006 04:42:11 +0000 |
| parents | cb2714fdf274 |
| children | accae094598f |
| files | libgaim/protocols/yahoo/yahoo.c libgaim/protocols/yahoo/yahoo_packet.c libgaim/protocols/yahoo/yahoo_picture.c |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/yahoo/yahoo.c Mon Aug 21 04:12:07 2006 +0000 +++ b/libgaim/protocols/yahoo/yahoo.c Mon Aug 21 04:42:11 2006 +0000 @@ -2382,7 +2382,7 @@ yd->rxqueue = g_realloc(yd->rxqueue, yd->rxlen + len + 1); memcpy(yd->rxqueue + yd->rxlen, buf, len); yd->rxlen += len; - i = buf = yd->rxqueue; + i = buf = (char *)yd->rxqueue; len = yd->rxlen; } buf[len] = '\0';
--- a/libgaim/protocols/yahoo/yahoo_packet.c Mon Aug 21 04:12:07 2006 +0000 +++ b/libgaim/protocols/yahoo/yahoo_packet.c Mon Aug 21 04:42:11 2006 +0000 @@ -113,7 +113,7 @@ void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len) { int pos = 0; - char key[64], *delimiter, *esc; + char key[64], *delimiter; gboolean accept; int x; struct yahoo_pair *pair; @@ -174,10 +174,13 @@ pkt->hash = g_slist_prepend(pkt->hash, pair); #ifdef DEBUG - esc = g_strescape(pair->value, NULL); - gaim_debug(GAIM_DEBUG_MISC, "yahoo", - "Key: %d \tValue: %s\n", pair->key, esc); - g_free(esc); + { + char *esc; + esc = g_strescape(pair->value, NULL); + gaim_debug(GAIM_DEBUG_MISC, "yahoo", + "Key: %d \tValue: %s\n", pair->key, esc); + g_free(esc); + } #endif } else { g_free(pair);
--- a/libgaim/protocols/yahoo/yahoo_picture.c Mon Aug 21 04:12:07 2006 +0000 +++ b/libgaim/protocols/yahoo/yahoo_picture.c Mon Aug 21 04:42:11 2006 +0000 @@ -464,7 +464,7 @@ pkt_buf_len = yahoo_packet_build(pkt, 8, FALSE, &pkt_buf); yahoo_packet_free(pkt); - g_string_prepend_len(d->str, pkt_buf, pkt_buf_len); + g_string_prepend_len(d->str, (char *)pkt_buf, pkt_buf_len); g_free(pkt_buf); g_string_prepend(d->str, header);