diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-05 21:20:44 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-05 21:20:44 +0100 |
| commit | f7d12f7f8014208c5c0b744d34b753d01bdf2ec2 (patch) | |
| tree | 0ab638d79ac901c3aeebbd2311bf60940b86e9bc /protocols | |
| parent | 65a4a649a6798f7e922b0a32de690260c83e0451 (diff) | |
Some fixes for compiler warnings that only show up when compiling with -O2,
and some additions to the Debian package description.
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/oscar/oscar.c | 4 | ||||
| -rw-r--r-- | protocols/yahoo/yahoo.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 ) |