pidgin/android/libpurple2

Fix a few cases of dead code
release-2.x.y
2013-02-26, Daniel Atallah
6dbfcd72998e
Parents 23927269a23a
Children 448dd56e312d
Fix a few cases of dead code
3 files changed, 2 insertions(+), 8 deletions(-)
  • +0 -4
    libpurple/protocols/jabber/ibb.c
  • +1 -3
    libpurple/protocols/jabber/usermood.c
  • +1 -1
    libpurple/protocols/silc/silc.c
    • --- a/libpurple/protocols/jabber/ibb.c Tue Feb 26 22:18:28 2013 -0500
    +++ b/libpurple/protocols/jabber/ibb.c Tue Feb 26 22:34:02 2013 -0500
    @@ -472,10 +472,6 @@
    purple_debug_info("jabber", "IBB: calling closed handler\n");
    sess->closed_cb(sess);
    }
    -
    - } else {
    - /* this should never happen */
    - purple_debug_error("jabber", "Received bogus iq for IBB session\n");
    }
    } else if (open) {
    JabberIq *result;
    --- a/libpurple/protocols/jabber/usermood.c Tue Feb 26 22:18:28 2013 -0500
    +++ b/libpurple/protocols/jabber/usermood.c Tue Feb 26 22:34:02 2013 -0500
    @@ -148,11 +148,9 @@
    }
    }
    }
    - if (newmood != NULL && moodtext != NULL)
    - break;
    }
    if (newmood != NULL && moodtext != NULL)
    - break;
    + break;
    }
    if (newmood != NULL) {
    purple_prpl_got_user_status(js->gc->account, from, "mood",
    --- a/libpurple/protocols/silc/silc.c Tue Feb 26 22:18:28 2013 -0500
    +++ b/libpurple/protocols/silc/silc.c Tue Feb 26 22:34:02 2013 -0500
    @@ -1798,7 +1798,7 @@
    }
    silcargs = g_strjoinv(" ", args);
    - silccmd = g_strconcat(cmd, " ", args ? silcargs : NULL, NULL);
    + silccmd = g_strconcat(cmd, " ", silcargs, NULL);
    g_free(silcargs);
    if (!silc_client_command_call(sg->client, sg->conn, silccmd)) {
    g_free(silccmd);