diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/oscar/chat.c | 3 | ||||
| -rw-r--r-- | protocols/oscar/chatnav.c | 15 | ||||
| -rw-r--r-- | protocols/oscar/icq.c | 7 | ||||
| -rw-r--r-- | protocols/oscar/im.c | 7 | ||||
| -rw-r--r-- | protocols/oscar/misc.c | 3 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 97 | ||||
| -rw-r--r-- | protocols/oscar/rxqueue.c | 4 | ||||
| -rw-r--r-- | protocols/oscar/service.c | 10 |
8 files changed, 56 insertions, 90 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. diff --git a/protocols/oscar/chatnav.c b/protocols/oscar/chatnav.c index 7cfc52af..e2de2ff3 100644 --- a/protocols/oscar/chatnav.c +++ b/protocols/oscar/chatnav.c @@ -138,12 +138,8 @@ static int parseinfo_perms(aim_session_t *sess, aim_module_t *mod, aim_frame_t * /* * Type 0x0002: Unknown */ - if (aim_gettlv(innerlist, 0x0002, 1)) { - guint16 classperms; - - classperms = aim_gettlv16(innerlist, 0x0002, 1); - - } + if (aim_gettlv(innerlist, 0x0002, 1)) + ; /* * Type 0x00c9: Flags @@ -203,11 +199,8 @@ static int parseinfo_perms(aim_session_t *sess, aim_module_t *mod, aim_frame_t * * 2 Exchange creation allowed * */ - if (aim_gettlv(innerlist, 0x00d5, 1)) { - guint8 createperms; - - createperms = aim_gettlv8(innerlist, 0x00d5, 1); - } + if (aim_gettlv(innerlist, 0x00d5, 1)) + ; /* * Type 0x00d6: Character Set (First Time) diff --git a/protocols/oscar/icq.c b/protocols/oscar/icq.c index f7c02e04..c2f8dda6 100644 --- a/protocols/oscar/icq.c +++ b/protocols/oscar/icq.c @@ -234,8 +234,7 @@ static int icqresponse(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_tlvlist_t *tl; 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))) { aim_freetlvchain(&tl); @@ -245,8 +244,8 @@ static int icqresponse(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, 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); diff --git a/protocols/oscar/im.c b/protocols/oscar/im.c index 4169ea4d..231dd959 100644 --- a/protocols/oscar/im.c +++ b/protocols/oscar/im.c @@ -918,7 +918,6 @@ static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a { int i, ret = 0; aim_rxcallback_t userfunc; - guint8 cookie[8]; guint16 channel; aim_tlvlist_t *tlvlist; char *sn; @@ -930,7 +929,7 @@ static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a /* ICBM Cookie. */ for (i = 0; i < 8; i++) - cookie[i] = aimbs_get8(bs); + aimbs_get8(bs); /* Channel ID */ channel = aimbs_get16(bs); @@ -1413,7 +1412,7 @@ static void incomingim_ch2_icqserverrelay_free(aim_session_t *sess, struct aim_i static void incomingim_ch2_icqserverrelay(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args, aim_bstream_t *servdata) { guint16 hdrlen, msglen, dc; - guint8 msgtype, msgflags; + guint8 msgtype; guint8 *plugin; int i = 0, tmp = 0; struct im_connection *ic = sess->aux_data; @@ -1441,7 +1440,7 @@ static void incomingim_ch2_icqserverrelay(aim_session_t *sess, aim_module_t *mod if (!tmp) { /* message follows */ msgtype = aimbs_getle8(servdata); - msgflags = aimbs_getle8(servdata); + aimbs_getle8(servdata); /* msgflags */ aim_bstream_advance(servdata, 0x04); /* status code and priority code */ diff --git a/protocols/oscar/misc.c b/protocols/oscar/misc.c index e5c5c26f..58fb6c31 100644 --- a/protocols/oscar/misc.c +++ b/protocols/oscar/misc.c @@ -309,7 +309,6 @@ int aim_setdirectoryinfo(aim_session_t *sess, aim_conn_t *conn, const char *firs int aim_setuserinterests(aim_session_t *sess, aim_conn_t *conn, const char *interest1, const char *interest2, const char *interest3, const char *interest4, const char *interest5, guint16 privacy) { aim_frame_t *fr; - aim_snacid_t snacid; aim_tlvlist_t *tl = NULL; /* ?? privacy ?? */ @@ -329,7 +328,7 @@ int aim_setuserinterests(aim_session_t *sess, aim_conn_t *conn, const char *inte if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+aim_sizetlvchain(&tl)))) 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); aim_writetlvchain(&fr->data, &tl); diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 27e8f210..41a194ab 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -1071,12 +1071,12 @@ static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_ static void gaim_icq_authgrant(void *data_) { struct icq_auth *data = data_; - char *uin, message; + char *uin; struct oscar_data *od = (struct oscar_data *)data->ic->proto_data; uin = g_strdup_printf("%u", data->uin); - message = 0; aim_ssi_auth_reply(od->sess, od->conn, uin, 1, ""); + // char *message = 0; // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message); imcb_ask_add(data->ic, uin, NULL); @@ -1218,11 +1218,11 @@ static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...) { static int gaim_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...) { va_list ap; - guint16 chan, nummissed, reason; + guint16 nummissed, reason; aim_userinfo_t *userinfo; va_start(ap, fr); - chan = (guint16)va_arg(ap, unsigned int); + va_arg(ap, unsigned int); /* chan */ userinfo = va_arg(ap, aim_userinfo_t *); nummissed = (guint16)va_arg(ap, unsigned int); reason = (guint16)va_arg(ap, unsigned int); @@ -1334,13 +1334,12 @@ static int gaim_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...) { } static int gaim_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...) { - char *msg; guint16 id; va_list ap; va_start(ap, fr); id = (guint16)va_arg(ap, unsigned int); - msg = va_arg(ap, char *); + va_arg(ap, char *); /* msg */ va_end(ap); if (id < 4) @@ -1360,13 +1359,9 @@ static int gaim_chatnav_info(aim_session_t *sess, aim_frame_t *fr, ...) { switch(type) { case 0x0002: { - guint8 maxrooms; - struct aim_chat_exchangeinfo *exchanges; - int exchangecount; // i; - - maxrooms = (guint8)va_arg(ap, unsigned int); - exchangecount = va_arg(ap, int); - exchanges = va_arg(ap, struct aim_chat_exchangeinfo *); + va_arg(ap, unsigned int); /* maxrooms */ + va_arg(ap, int); /* exchangecount */ + va_arg(ap, struct aim_chat_exchangeinfo *); /* exchanges */ va_end(ap); while (odata->create_rooms) { @@ -1379,21 +1374,19 @@ static int gaim_chatnav_info(aim_session_t *sess, aim_frame_t *fr, ...) { } break; case 0x0008: { - char *fqcn, *name, *ck; - guint16 instance, flags, maxmsglen, maxoccupancy, unknown, exchange; - guint8 createperms; - guint32 createtime; + char *ck; + guint16 instance, exchange; - fqcn = va_arg(ap, char *); + va_arg(ap, char *); /* fqcn */ instance = (guint16)va_arg(ap, unsigned int); exchange = (guint16)va_arg(ap, unsigned int); - flags = (guint16)va_arg(ap, unsigned int); - createtime = va_arg(ap, guint32); - maxmsglen = (guint16)va_arg(ap, unsigned int); - maxoccupancy = (guint16)va_arg(ap, unsigned int); - createperms = (guint8)va_arg(ap, int); - unknown = (guint16)va_arg(ap, unsigned int); - name = va_arg(ap, char *); + va_arg(ap, unsigned int); /* flags */ + va_arg(ap, guint32); /* createtime */ + va_arg(ap, unsigned int); /* maxmsglen */ + va_arg(ap, unsigned int); /* maxoccupancy */ + va_arg(ap, int); /* createperms */ + va_arg(ap, unsigned int); /* unknown */ + va_arg(ap, char *); /* name */ ck = va_arg(ap, char *); va_end(ap); @@ -1455,27 +1448,21 @@ static int gaim_chat_leave(aim_session_t *sess, aim_frame_t *fr, ...) { static int gaim_chat_info_update(aim_session_t *sess, aim_frame_t *fr, ...) { va_list ap; - aim_userinfo_t *userinfo; - struct aim_chat_roominfo *roominfo; - char *roomname; - int usercount; - char *roomdesc; - guint16 unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen; - guint32 creationtime; + guint16 maxmsglen, maxvisiblemsglen; struct im_connection *ic = sess->aux_data; struct chat_connection *ccon = find_oscar_chat_by_conn(ic, fr->conn); va_start(ap, fr); - roominfo = va_arg(ap, struct aim_chat_roominfo *); - roomname = va_arg(ap, char *); - usercount= va_arg(ap, int); - userinfo = va_arg(ap, aim_userinfo_t *); - roomdesc = va_arg(ap, char *); - unknown_c9 = (guint16)va_arg(ap, int); - creationtime = (guint32)va_arg(ap, unsigned long); + va_arg(ap, struct aim_chat_roominfo *); /* roominfo */ + va_arg(ap, char *); /* roomname */ + va_arg(ap, int); /* usercount */ + va_arg(ap, aim_userinfo_t *); /* userinfo */ + va_arg(ap, char *); /* roomdesc */ + va_arg(ap, int); /* unknown_c9 */ + va_arg(ap, unsigned long); /* creationtime */ maxmsglen = (guint16)va_arg(ap, int); - unknown_d2 = (guint16)va_arg(ap, int); - unknown_d5 = (guint16)va_arg(ap, int); + va_arg(ap, int); /* unknown_d2 */ + va_arg(ap, int); /* unknown_d5 */ maxvisiblemsglen = (guint16)va_arg(ap, int); va_end(ap); @@ -1516,19 +1503,19 @@ static int gaim_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...) { }; #endif va_list ap; - guint16 code, rateclass; - guint32 windowsize, clear, alert, limit, disconnect, currentavg, maxavg; + guint16 code; + guint32 windowsize, clear, currentavg; va_start(ap, fr); code = (guint16)va_arg(ap, unsigned int); - rateclass= (guint16)va_arg(ap, unsigned int); + va_arg(ap, unsigned int); /* rateclass */ windowsize = (guint32)va_arg(ap, unsigned long); clear = (guint32)va_arg(ap, unsigned long); - alert = (guint32)va_arg(ap, unsigned long); - limit = (guint32)va_arg(ap, unsigned long); - disconnect = (guint32)va_arg(ap, unsigned long); + va_arg(ap, unsigned long); /* alert */ + va_arg(ap, unsigned long); /* limit */ + va_arg(ap, unsigned long); /* disconnect */ currentavg = (guint32)va_arg(ap, unsigned long); - maxavg = (guint32)va_arg(ap, unsigned long); + va_arg(ap, unsigned long); /* maxavg */ va_end(ap); /* XXX fix these values */ @@ -2416,11 +2403,11 @@ int gaim_parsemtn(aim_session_t *sess, aim_frame_t *fr, ...) { struct im_connection * ic = sess->aux_data; va_list ap; - guint16 type1, type2; + guint16 type2; char * sn; va_start(ap, fr); - type1 = va_arg(ap, int); + va_arg(ap, int); /* type1 */ sn = va_arg(ap, char*); type2 = va_arg(ap, int); va_end(ap); @@ -2540,9 +2527,7 @@ struct groupchat *oscar_chat_join_internal(struct im_connection *ic, const char aim_conn_t * cur; if((cur = aim_getconn_type(od->sess, AIM_CONN_TYPE_CHATNAV))) { - int st; - - st = aim_chatnav_createroom(od->sess, cur, room, exchange_number); + aim_chatnav_createroom(od->sess, cur, room, exchange_number); return ret; } else { @@ -2566,10 +2551,8 @@ struct groupchat *oscar_chat_join(struct im_connection *ic, const char *room, struct groupchat *oscar_chat_with(struct im_connection * ic, char *who) { struct oscar_data * od = (struct oscar_data *)ic->proto_data; - struct groupchat *ret; static int chat_id = 0; char * chatname, *s; - struct groupchat *c; chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "", ic->acc->user, chat_id++); @@ -2578,8 +2561,8 @@ struct groupchat *oscar_chat_with(struct im_connection * ic, char *who) if (!isalnum(*s)) *s = '0'; - c = imcb_chat_new(ic, chatname); - ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4); + imcb_chat_new(ic, chatname); + oscar_chat_join_internal(ic, chatname, NULL, NULL, 4); aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0); g_free(chatname); diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c index 34f389af..081e967c 100644 --- a/protocols/oscar/rxqueue.c +++ b/protocols/oscar/rxqueue.c @@ -387,10 +387,8 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn) * or we break. We must handle it just in case. */ 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); return -1; diff --git a/protocols/oscar/service.c b/protocols/oscar/service.c index acd09150..d4f516c0 100644 --- a/protocols/oscar/service.c +++ b/protocols/oscar/service.c @@ -562,9 +562,7 @@ static int migrate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_ */ 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"); } @@ -700,11 +698,10 @@ int aim_setversions(aim_session_t *sess, aim_conn_t *conn) /* Host versions (group 1, subtype 0x18) */ 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); versions = aimbs_getraw(bs, aim_bstream_empty(bs)); g_free(versions); @@ -730,7 +727,6 @@ int aim_setextstatus(aim_session_t *sess, aim_conn_t *conn, guint32 status) aim_snacid_t snacid; aim_tlvlist_t *tl = NULL; guint32 data; - int tlvlen; struct im_connection *ic = sess ? sess->aux_data : NULL; data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */ @@ -738,7 +734,7 @@ int aim_setextstatus(aim_session_t *sess, aim_conn_t *conn, guint32 status) if (ic && set_getbool(&ic->acc->set, "web_aware")) data |= AIM_ICQ_STATE_WEBAWARE; - tlvlen = aim_addtlvtochain32(&tl, 0x0006, data); + aim_addtlvtochain32(&tl, 0x0006, data); if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8))) return -ENOMEM; |