Fixed cppcheck warnings

2014-04-26 00:36:36 +01:00
parent ab4ea80a70
commit d6e92f62dc
26 changed files with 41 additions and 206 deletions
--- a/src/muc.c
+++ b/src/muc.c
@@ -494,10 +494,8 @@ muc_complete_roster_nick_change(const char * const room,

    if (chat_room != NULL) {
        char *old_nick = g_hash_table_lookup(chat_room->nick_changes, nick);
-        char *old_nick_cpy;
-
        if (old_nick != NULL) {
-            old_nick_cpy = strdup(old_nick);
+            char *old_nick_cpy = strdup(old_nick);
            g_hash_table_remove(chat_room->nick_changes, nick);

            return old_nick_cpy;
@@ -543,4 +541,4 @@ gint _compare_participants(PContact a, PContact b)
    g_free(key_b);

    return result;
-}
+}