Revision: 16942
Author: thekingant
Date: 2006-08-20 21:54:11 -0700 (Sun, 20 Aug 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16942&view=rev
Log Message:
-----------
This was warning marv
Modified Paths:
--------------
trunk/libgaim/protocols/yahoo/yahoo_packet.c
Modified: trunk/libgaim/protocols/yahoo/yahoo_packet.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_packet.c 2006-08-21 04:42:11 UTC (rev 16941)
+++ trunk/libgaim/protocols/yahoo/yahoo_packet.c 2006-08-21 04:54:11 UTC (rev 16942)
@@ -113,7 +113,8 @@
void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len)
{
int pos = 0;
- char key[64], *delimiter;
+ char key[64];
+ const guchar *delimiter;
gboolean accept;
int x;
struct yahoo_pair *pair;
@@ -160,7 +161,7 @@
}
if (accept) {
- delimiter = strstr((char *)&data[pos], "\xc0\x80");
+ delimiter = (const guchar *)strstr((char *)&data[pos], "\xc0\x80");
if (delimiter == NULL)
{
/* Malformed packet! (it doesn't end in 0xc0 0x80) */
@@ -168,7 +169,7 @@
pos = len;
continue;
}
- x = (guint64)delimiter - (guint64)data;
+ x = delimiter - data;
pair->value = g_strndup((const gchar *)&data[pos], x - pos);
pos = x;
pkt->hash = g_slist_prepend(pkt->hash, pair);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
