Changeset 6e9ae72 for protocols/oscar/rxqueue.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/rxqueue.c (modified) (1 diff)

protocols/oscar/rxqueue.c

@@ -388 +388 @@
          */
         if (aimbs_get8(&flaphdr) != 0x2a) {
-                guint8 start;
-
                 aim_bstream_rewind(&flaphdr);
-                start = aimbs_get8(&flaphdr);
+                aimbs_get8(&flaphdr);
                 imcb_error(sess->aux_data, "FLAP framing disrupted");
                 aim_conn_close(conn);