Merging compiler warning fixes from vmiklos.

This change also uncovered one bug in groupchat handling in OSCAR, which
I fixed during the merge.

11 files changed, 75 insertions, 138 deletions

diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index 37ac2889..69114469 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -307,7 +307,6 @@ gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
 {
 	struct msn_switchboard *sb = data;
 	struct im_connection *ic;
-	struct msn_data *md;
 	char buf[1024];
 	
 	/* Are we still alive? */
@@ -315,7 +314,6 @@ gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
 		return FALSE;
 	
 	ic = sb->ic;
-	md = ic->proto_data;
 	
 	if( source != sb->fd )
 	{
@@ -674,16 +672,12 @@ static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msgl
 	struct msn_switchboard *sb = handler->data;
 	struct im_connection *ic = sb->ic;
 	char *body;
-	int blen = 0;
 	
 	if( !num_parts )
 		return( 1 );
 	
 	if( ( body = strstr( msg, "\r\n\r\n" ) ) )
-	{
 		body += 4;
-		blen = msglen - ( body - msg );
-	}
 	
 	if( strcmp( cmd[0], "MSG" ) == 0 )
 	{
diff --git a/protocols/msn/soap.c b/protocols/msn/soap.c
index ccfc1a67..7d9f3791 100644
--- a/protocols/msn/soap.c
+++ b/protocols/msn/soap.c
@@ -209,7 +209,6 @@ static char *msn_soap_abservice_build( const char *body_fmt, const char *scenari
 static void msn_soap_debug_print( const char *headers, const char *payload )
 {
 	char *s;
-	int st;
 	
 	if( !getenv( "BITLBEE_DEBUG" ) )
 		return;
@@ -217,9 +216,9 @@ static void msn_soap_debug_print( const char *headers, const char *payload )
 	if( headers )
 	{
 		if( ( s = strstr( headers, "\r\n\r\n" ) ) )
-			st = write( 2, headers, s - headers + 4 );
+			write( 2, headers, s - headers + 4 );
 		else
-			st = write( 2, headers, strlen( headers ) );
+			write( 2, headers, strlen( headers ) );
 	}
 	
 	if( payload )
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..1aefd6e7 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
@@ -204,9 +200,7 @@ static int parseinfo_perms(aim_session_t *sess, aim_module_t *mod, aim_frame_t *
 		 * 
 		 */
 		if (aim_gettlv(innerlist, 0x00d5, 1)) {
-			guint8 createperms;
-
-			createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+			aim_gettlv8(innerlist, 0x00d5, 1); /* createperms */
 		}
 
 		/*
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..de4efb6a 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 {
@@ -2569,7 +2554,6 @@ struct groupchat *oscar_chat_with(struct im_connection * ic, char *who)
 	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,13 +2562,12 @@ 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);
 	aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
 
 	g_free(chatname);
 	
-	return NULL;
+	return ret;
 }
 
 void oscar_accept_chat(void *data)
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..a2678764 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); /* == vercount * 4 */
 	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); /* tlvlen */
 
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))
 		return -ENOMEM;
diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
index 07689809..ca2a161e 100644
--- a/protocols/yahoo/libyahoo2.c
+++ b/protocols/yahoo/libyahoo2.c
@@ -1808,7 +1808,6 @@ static void yahoo_https_auth_token_init(struct yahoo_https_auth_data *had)
 {
 	struct yahoo_input_data *yid = had->yid;
 	struct yahoo_data *yd = yid->yd;
-	struct http_request *req;
 	char *login, *passwd, *chal;
 	char *url;
 	
@@ -1822,7 +1821,7 @@ static void yahoo_https_auth_token_init(struct yahoo_https_auth_data *had)
 	url = g_strdup_printf("https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=%d&login=%s&passwd=%s&chal=%s",
 	                       (int) time(NULL), login, passwd, chal);
 	
-	req = http_dorequest_url(url, yahoo_https_auth_token_finish, had);
+	http_dorequest_url(url, yahoo_https_auth_token_finish, had);
 	
 	g_free(url);
 	g_free(chal);
@@ -1869,13 +1868,12 @@ fail:
 
 static void yahoo_https_auth_init(struct yahoo_https_auth_data *had)
 {
-	struct http_request *req;
 	char *url;
 	
 	url = g_strdup_printf("https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=%d&token=%s",
 	                      (int) time(NULL), had->token);
 	
-	req = http_dorequest_url(url, yahoo_https_auth_finish, had);
+	http_dorequest_url(url, yahoo_https_auth_finish, had);
 	
 	g_free(url);
 }
@@ -1989,8 +1987,6 @@ static void yahoo_process_auth_resp(struct yahoo_input_data *yid,
 	struct yahoo_packet *pkt)
 {
 	struct yahoo_data *yd = yid->yd;
-	char *login_id;
-	char *handle;
 	char *url = NULL;
 	int login_status = -1;
 
@@ -1999,9 +1995,9 @@ static void yahoo_process_auth_resp(struct yahoo_input_data *yid,
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 		if (pair->key == 0)
-			login_id = pair->value;
+			; /* login_id */
 		else if (pair->key == 1)
-			handle = pair->value;
+			; /* handle */
 		else if (pair->key == 20)
 			url = pair->value;
 		else if (pair->key == 66)
@@ -2088,9 +2084,7 @@ static void yahoo_process_contact(struct yahoo_input_data *yid,
 	char *who = NULL;
 	char *msg = NULL;
 	char *name = NULL;
-	long tm = 0L;
 	int state = YAHOO_STATUS_AVAILABLE;
-	int online = 0;
 	int away = 0;
 	int idle = 0;
 	int mobile = 0;
@@ -2110,9 +2104,9 @@ static void yahoo_process_contact(struct yahoo_input_data *yid,
 		else if (pair->key == 10)
 			state = strtol(pair->value, NULL, 10);
 		else if (pair->key == 15)
-			tm = strtol(pair->value, NULL, 10);
+			; /* tm */
 		else if (pair->key == 13)
-			online = strtol(pair->value, NULL, 10);
+			; /* online */
 		else if (pair->key == 47)
 			away = strtol(pair->value, NULL, 10);
 		else if (pair->key == 137)
@@ -2139,7 +2133,6 @@ static void yahoo_process_buddyadd(struct yahoo_input_data *yid,
 	char *who = NULL;
 	char *where = NULL;
 	int status = 0;
-	char *me = NULL;
 
 	struct yahoo_buddy *bud = NULL;
 
@@ -2147,7 +2140,7 @@ static void yahoo_process_buddyadd(struct yahoo_input_data *yid,
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 		if (pair->key == 1)
-			me = pair->value;
+			; /* Me... don't care */
 		if (pair->key == 7)
 			who = pair->value;
 		if (pair->key == 65)
@@ -2203,8 +2196,6 @@ static void yahoo_process_buddydel(struct yahoo_input_data *yid,
 	struct yahoo_data *yd = yid->yd;
 	char *who = NULL;
 	char *where = NULL;
-	int unk_66 = 0;
-	char *me = NULL;
 	struct yahoo_buddy *bud;
 
 	YList *buddy;
@@ -2213,13 +2204,13 @@ static void yahoo_process_buddydel(struct yahoo_input_data *yid,
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 		if (pair->key == 1)
-			me = pair->value;
+			; /* Me... don't care */
 		else if (pair->key == 7)
 			who = pair->value;
 		else if (pair->key == 65)
 			where = pair->value;
 		else if (pair->key == 66)
-			unk_66 = strtol(pair->value, NULL, 10);
+			; /* unk_66 */
 		else
 			DEBUG_MSG(("unknown key: %d = %s", pair->key,
 					pair->value));
@@ -2255,22 +2246,17 @@ static void yahoo_process_buddydel(struct yahoo_input_data *yid,
 static void yahoo_process_ignore(struct yahoo_input_data *yid,
 	struct yahoo_packet *pkt)
 {
-	char *who = NULL;
-	int status = 0;
-	char *me = NULL;
-	int un_ignore = 0;
-
 	YList *l;
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 		if (pair->key == 0)
-			who = pair->value;
+			; /* who */
 		if (pair->key == 1)
-			me = pair->value;
+			; /* Me... don't care */
 		if (pair->key == 13)	/* 1 == ignore, 2 == unignore */
-			un_ignore = strtol(pair->value, NULL, 10);
+			;
 		if (pair->key == 66)
-			status = strtol(pair->value, NULL, 10);
+			; /* status */
 	}
 
 	/*
@@ -2292,7 +2278,6 @@ static void yahoo_process_voicechat(struct yahoo_input_data *yid,
 	char *who = NULL;
 	char *me = NULL;
 	char *room = NULL;
-	char *voice_room = NULL;
 
 	YList *l;
 	for (l = pkt->hash; l; l = l->next) {
@@ -2302,7 +2287,7 @@ static void yahoo_process_voicechat(struct yahoo_input_data *yid,
 		if (pair->key == 5)
 			me = pair->value;
 		if (pair->key == 13)
-			voice_room = pair->value;
+			; /* voice room */
 		if (pair->key == 57)
 			room = pair->value;
 	}
@@ -2437,7 +2422,6 @@ static YList *webcam_queue = NULL;
 static void yahoo_process_webcam_key(struct yahoo_input_data *yid,
 	struct yahoo_packet *pkt)
 {
-	char *me = NULL;
 	char *key = NULL;
 	char *who = NULL;
 
@@ -2446,7 +2430,7 @@ static void yahoo_process_webcam_key(struct yahoo_input_data *yid,
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 		if (pair->key == 5)
-			me = pair->value;
+			; /* me */
 		if (pair->key == 61)
 			key = pair->value;
 	}
@@ -3368,7 +3352,6 @@ static void yahoo_webcam_connect(struct yahoo_input_data *y)
 {
 	struct yahoo_webcam *wcm = y->wcm;
 	struct yahoo_input_data *yid;
-	struct yahoo_server_settings *yss;
 
 	if (!wcm || !wcm->server || !wcm->key)
 		return;
@@ -3381,8 +3364,6 @@ static void yahoo_webcam_connect(struct yahoo_input_data *y)
 	yid->wcm = y->wcm;
 	y->wcm = NULL;
 
-	yss = y->yd->server_settings;
-
 	yid->wcd = y_new0(struct yahoo_webcam_data, 1);
 
 	LOG(("Connecting to: %s:%d", wcm->server, wcm->port));
@@ -4974,8 +4955,6 @@ static void yahoo_process_filetransferaccept(struct yahoo_input_data *yid,
 {
 	YList *l;
 	struct send_file_data *sfd;
-	char *who = NULL;
-	char *filename = NULL;
 	char *id = NULL;
 	char *token = NULL;
 
@@ -4983,7 +4962,7 @@ static void yahoo_process_filetransferaccept(struct yahoo_input_data *yid,
 		struct yahoo_pair *pair = l->data;
 		switch (pair->key) {
 		case 4:
-			who = pair->value;
+			/* who */
 			break;
 		case 5:
 			/* Me... don't care */
@@ -4997,7 +4976,7 @@ static void yahoo_process_filetransferaccept(struct yahoo_input_data *yid,
 			token = pair->value;
 			break;
 		case 27:
-			filename = pair->value;
+			/* filename */
 			break;
 		}
 	}
@@ -5022,8 +5001,6 @@ static void yahoo_process_filetransferinfo(struct yahoo_input_data *yid,
 	struct yahoo_packet *pkt)
 {
 	YList *l;
-	char *who = NULL;
-	char *filename = NULL;
 	char *id = NULL;
 	char *token = NULL;
 	char *ip_addr = NULL;
@@ -5035,7 +5012,7 @@ static void yahoo_process_filetransferinfo(struct yahoo_input_data *yid,
 		switch (pair->key) {
 		case 1:
 		case 4:
-			who = pair->value;
+			/* who */
 			break;
 		case 5:
 			/* Me... don't care */
@@ -5052,7 +5029,7 @@ static void yahoo_process_filetransferinfo(struct yahoo_input_data *yid,
 			token = pair->value;
 			break;
 		case 27:
-			filename = pair->value;
+			/* filename */
 			break;
 		}
 	}