Changeset 6e9ae72 for protocols/oscar/im.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

File:

• protocols/oscar/im.c (modified) (4 diffs)

protocols/oscar/im.c

@@ -919 +919 @@
         int i, ret = 0;
         aim_rxcallback_t userfunc;
-        guint8 cookie[8];
         guint16 channel;
         aim_tlvlist_t *tlvlist;
@@ -931 +930 @@
         /* ICBM Cookie. */
         for (i = 0; i < 8; i++)
-                cookie[i] = aimbs_get8(bs);
+                aimbs_get8(bs);
 
         /* Channel ID */
@@ -1414 +1413 @@
 {
         guint16 hdrlen, msglen, dc;
-        guint8 msgtype, msgflags;
+        guint8 msgtype;
     guint8 *plugin;
     int i = 0, tmp = 0;
@@ -1442 +1441 @@
 
         msgtype = aimbs_getle8(servdata);
-        msgflags = aimbs_getle8(servdata);
+        aimbs_getle8(servdata); /* msgflags */
 
         aim_bstream_advance(servdata, 0x04); /* status code and priority code */