aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/oscar/chat.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2011-12-17 14:50:01 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2011-12-17 14:50:01 +0100
commit6e9ae727bcd95eb820fa28becaf9f79ac463de5f (patch)
tree2d1d2a0f511d1356caf4a3f7c29c1578f0583a95 /protocols/oscar/chat.c
parent87dddee3a14d7755204d6fc4b321729bad02ce4e (diff)
parent17f057d70b1513710e3d765969205625f0fc7b76 (diff)
Mainline merge.
Diffstat (limited to 'protocols/oscar/chat.c')
-rw-r--r--protocols/oscar/chat.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/protocols/oscar/chat.c b/protocols/oscar/chat.c
index fbf45693..a5db8fba 100644
--- a/protocols/oscar/chat.c
+++ b/protocols/oscar/chat.c
@@ -383,7 +383,6 @@ static int infoupdate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
guint8 detaillevel = 0;
char *roomname = NULL;
struct aim_chat_roominfo roominfo;
- guint16 tlvcount = 0;
aim_tlvlist_t *tlvlist;
char *roomdesc = NULL;
guint16 flags = 0;
@@ -400,7 +399,7 @@ static int infoupdate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
return 1;
}
- tlvcount = aimbs_get16(bs);
+ aimbs_get16(bs); /* tlv count */
/*
* Everything else are TLVs.