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

protocols/oscar/service.c

@@ -563 +563 @@
         groupcount = aimbs_get16(bs);
         for (i = 0; i < groupcount; i++) {
-                guint16 group;
-
-                group = aimbs_get16(bs);
+                aimbs_get16(bs);
 
                 imcb_error(sess->aux_data, "bifurcated migration unsupported");
@@ -701 +699 @@
 static int hostversions(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
-        int vercount;
         guint8 *versions;
 
         /* This is frivolous. (Thank you SmarterChild.) */
-        vercount = aim_bstream_empty(bs)/4;
+        aim_bstream_empty(bs); /* == vercount * 4 */
         versions = aimbs_getraw(bs, aim_bstream_empty(bs));
         g_free(versions);
@@ -731 +728 @@
         aim_tlvlist_t *tl = NULL;
         guint32 data;
-        int tlvlen;
         struct im_connection *ic = sess ? sess->aux_data : NULL;
 
@@ -739 +735 @@
                 data |= AIM_ICQ_STATE_WEBAWARE;
 
-        tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
+        aim_addtlvtochain32(&tl, 0x0006, data); /* tlvlen */
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))