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

protocols/oscar/misc.c

@@ -310 +310 @@
 {
         aim_frame_t *fr;
-        aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
 
@@ -330 +329 @@
                 return -ENOMEM;
 
-        snacid = aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
+        aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
 
         aim_putsnac(&fr->data, 0x0002, 0x000f, 0x0000, 0);