Changeset 6e9ae72 for protocols/oscar/icq.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/icq.c (modified) (2 diffs)

protocols/oscar/icq.c

@@ -235 +235 @@
         aim_tlv_t *datatlv;
         aim_bstream_t qbs;
-        guint32 ouruin;
-        guint16 cmdlen, cmd, reqid;
+        guint16 cmd, reqid;
 
         if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
@@ -246 +245 @@
         aim_bstream_init(&qbs, datatlv->value, datatlv->length);
 
-        cmdlen = aimbs_getle16(&qbs);
-        ouruin = aimbs_getle32(&qbs);
+        aimbs_getle16(&qbs); /* cmdlen */
+        aimbs_getle32(&qbs); /* ouruin */
         cmd = aimbs_getle16(&qbs);
         reqid = aimbs_getle16(&qbs);