pidgin/pidgin

Remove NULL-checks before free(). No functional change.

2015-12-21, Michael McConville
d2f0259aa43f
Parents 07dcc28b6039
Children 04cf8cbe44d8
Remove NULL-checks before free(). No functional change.
8 files changed, 18 insertions(+), 35 deletions(-)
  • +3 -6
    libpurple/protocols/jabber/chat.c
  • +1 -2
    libpurple/protocols/jabber/disco.c
  • +1 -2
    libpurple/protocols/jabber/google/jingleinfo.c
  • +2 -4
    libpurple/protocols/jabber/ibb.c
  • +4 -8
    libpurple/protocols/jabber/jabber.c
  • +1 -2
    libpurple/protocols/jabber/message.c
  • +5 -9
    libpurple/protocols/jabber/presence.c
  • +1 -2
    libpurple/protocols/jabber/si.c
    • --- a/libpurple/protocols/jabber/chat.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/chat.c Mon Dec 21 14:46:12 2015 -0500
    @@ -540,8 +540,7 @@
    _("Configuration error"), msg,
    purple_request_cpar_from_connection(js->gc));
    - if(msg)
    - g_free(msg);
    + g_free(msg);
    return;
    }
    @@ -621,8 +620,7 @@
    _("Registration error"), msg,
    purple_request_cpar_from_connection(js->gc));
    - if(msg)
    - g_free(msg);
    + g_free(msg);
    return;
    }
    }
    @@ -692,8 +690,7 @@
    _("Registration error"), msg,
    purple_request_cpar_from_connection(js->gc));
    - if(msg)
    - g_free(msg);
    + g_free(msg);
    return;
    }
    --- a/libpurple/protocols/jabber/disco.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/disco.c Mon Dec 21 14:46:12 2015 -0500
    @@ -452,8 +452,7 @@
    port = ntohs(addr.in.sin_port);
    }
    - if (js->stun_ip)
    - g_free(js->stun_ip);
    + g_free(js->stun_ip);
    js->stun_ip = g_strdup(dst);
    js->stun_port = port;
    --- a/libpurple/protocols/jabber/google/jingleinfo.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/google/jingleinfo.c Mon Dec 21 14:46:12 2015 -0500
    @@ -53,8 +53,7 @@
    port = ntohs(addr.in.sin_port);
    }
    - if (js->stun_ip)
    - g_free(js->stun_ip);
    + g_free(js->stun_ip);
    js->stun_ip = g_strdup(dst);
    js->stun_port = port;
    --- a/libpurple/protocols/jabber/ibb.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/ibb.c Mon Dec 21 14:46:12 2015 -0500
    @@ -294,10 +294,8 @@
    if (sess) {
    /* reset callback */
    - if (sess->last_iq_id) {
    - g_free(sess->last_iq_id);
    - sess->last_iq_id = NULL;
    - }
    + g_free(sess->last_iq_id);
    + sess->last_iq_id = NULL;
    if (type == JABBER_IQ_ERROR) {
    jabber_ibb_session_close(sess);
    --- a/libpurple/protocols/jabber/jabber.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/jabber.c Mon Dec 21 14:46:12 2015 -0500
    @@ -101,10 +101,8 @@
    {
    char *open_stream;
    - if (js->stream_id) {
    - g_free(js->stream_id);
    - js->stream_id = NULL;
    - }
    + g_free(js->stream_id);
    + js->stream_id = NULL;
    open_stream = g_strdup_printf("<stream:stream to='%s' "
    "xmlns='" NS_XMPP_CLIENT "' "
    @@ -2638,10 +2636,8 @@
    if((jb = jabber_buddy_find(js, who, TRUE)) &&
    (jbr = jabber_buddy_find_resource(jb, jid->resource))) {
    - if(jbr->thread_id) {
    - g_free(jbr->thread_id);
    - jbr->thread_id = NULL;
    - }
    + g_free(jbr->thread_id);
    + jbr->thread_id = NULL;
    }
    jabber_id_free(jid);
    --- a/libpurple/protocols/jabber/message.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/message.c Mon Dec 21 14:46:12 2015 -0500
    @@ -147,8 +147,7 @@
    jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED;
    }
    - if(jbr->thread_id)
    - g_free(jbr->thread_id);
    + g_free(jbr->thread_id);
    jbr->thread_id = g_strdup(jbr->thread_id);
    }
    --- a/libpurple/protocols/jabber/presence.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/presence.c Mon Dec 21 14:46:12 2015 -0500
    @@ -245,10 +245,8 @@
    /* update old values */
    - if(js->old_msg)
    - g_free(js->old_msg);
    - if(js->old_avatarhash)
    - g_free(js->old_avatarhash);
    + g_free(js->old_msg);
    + g_free(js->old_avatarhash);
    js->old_msg = g_strdup(stripped);
    js->old_avatarhash = g_strdup(js->avatar_hash);
    js->old_state = state;
    @@ -440,7 +438,7 @@
    if (tmp && strstr(bare_jid, tmp) == NULL) {
    g_free(nickname);
    nickname = tmp;
    - } else if (tmp)
    + } else
    g_free(tmp);
    g_free(bare_jid);
    @@ -945,10 +943,8 @@
    if (presence.jid_from->node)
    presence.chat = jabber_chat_find(js, presence.jid_from->node,
    presence.jid_from->domain);
    - if(presence.jb->error_msg) {
    - g_free(presence.jb->error_msg);
    - presence.jb->error_msg = NULL;
    - }
    + g_free(presence.jb->error_msg);
    + presence.jb->error_msg = NULL;
    if (presence.type == JABBER_PRESENCE_AVAILABLE) {
    presence.state = JABBER_BUDDY_STATE_ONLINE;
    --- a/libpurple/protocols/jabber/si.c Sun Dec 20 20:46:34 2015 -0800
    +++ b/libpurple/protocols/jabber/si.c Mon Dec 21 14:46:12 2015 -0500
    @@ -351,8 +351,7 @@
    if(!jsx->accepted)
    return;
    - if(jsx->iq_id)
    - g_free(jsx->iq_id);
    + g_free(jsx->iq_id);
    jsx->iq_id = g_strdup(id);
    for(streamhost = purple_xmlnode_get_child(query, "streamhost"); streamhost;