Some fixes for compiler warnings that only show up when compiling with -O2,

and some additions to the Debian package description.

4 files changed, 12 insertions, 12 deletions

diff --git a/debian/control b/debian/control
index 436bef6d..56859a58 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
 Description: An IRC to other chat networks gateway (default version)
  This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
- Twitter.
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
 
 Package: bitlbee-libpurple
 Architecture: any
@@ -26,8 +26,8 @@ Conflicts: bitlbee
 Replaces: bitlbee
 Description: An IRC to other chat networks gateway (using libpurple)
  This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
- Twitter.
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
  .
  This package contains a version of BitlBee that uses the libpurple instant
  messaging library instead of built-in code, which adds support for more IM
@@ -43,8 +43,8 @@ Depends: ${misc:Depends}, net-tools
 Replaces: bitlbee
 Description: An IRC to other chat networks gateway (common files/docs)
  This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
- Twitter.
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
  .
  This package contains common files (mostly documentation) for bitlbee and
  bitlbee-libpurple.
@@ -54,7 +54,7 @@ Architecture: all
 Depends: ${misc:Depends}, bitlbee (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~)
 Description: An IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
- say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and
- Twitter.
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
  .
  This package holds development stuff for compiling plug-ins.
diff --git a/nick.c b/nick.c
index 87d8fa00..15c07995 100644
--- a/nick.c
+++ b/nick.c
@@ -115,7 +115,7 @@ char *nick_gen( bee_user_t *bu )
 	
 	while( fmt && *fmt && ret->len < MAX_NICK_LENGTH )
 	{
-		char *part, chop = '\0', *asc = NULL;
+		char *part = NULL, chop = '\0', *asc = NULL;
 		int len = MAX_NICK_LENGTH;
 		
 		if( *fmt != '%' )
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 87fa3323..3f5272cd 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -1962,7 +1962,7 @@ static int gaim_ssi_parserights(aim_session_t *sess, aim_frame_t *fr, ...) {
 
 static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
 	struct im_connection *ic = sess->aux_data;
-	struct aim_ssi_item *curitem, *curgroup;
+	struct aim_ssi_item *curitem, *curgroup = NULL;
 	int tmp;
 	char *nrm;
 
@@ -1979,7 +1979,7 @@ static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
 					if (curitem->data && aim_gettlv(curitem->data, 0x0131, 1))
 						    realname = aim_gettlv_str(curitem->data, 0x0131, 1);
 					
-					imcb_add_buddy(ic, nrm, curgroup->gid == curitem->gid ? curgroup->name : NULL);
+					imcb_add_buddy(ic, nrm, curgroup ? (curgroup->gid == curitem->gid ? curgroup->name : NULL) : NULL);
 					
 					if (realname) {
 						imcb_buddy_nick_hint(ic, nrm, realname);
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index e926e60c..9f7a7896 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -820,7 +820,7 @@ int ext_yahoo_connect(const char *host, int port)
 static void byahoo_accept_conf( void *data )
 {
 	struct byahoo_conf_invitation *inv = data;
-	struct groupchat *b;
+	struct groupchat *b = NULL;
 	GSList *l;
 	
 	for( l = inv->ic->groupchats; l; l = l->next )