pidgin/pidgin

Remove more NULL-checks before free()

2015-12-21, Michael McConville
5061721fd98f
Parents 04cf8cbe44d8
Children 6fd4989b77e4
Remove more NULL-checks before free()
8 files changed, 59 insertions(+), 121 deletions(-)
  • +1 -2
    libpurple/protocols/novell/nmconference.c
  • +2 -4
    libpurple/protocols/novell/nmconn.c
  • +8 -16
    libpurple/protocols/novell/nmcontact.c
  • +16 -35
    libpurple/protocols/novell/nmevent.c
  • +1 -2
    libpurple/protocols/novell/nmmessage.c
  • +1 -2
    libpurple/protocols/novell/nmrequest.c
  • +21 -42
    libpurple/protocols/novell/nmuserrecord.c
  • +9 -18
    libpurple/protocols/novell/novell.c
    • --- a/libpurple/protocols/novell/nmconference.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmconference.c Mon Dec 21 15:00:42 2015 -0500
    @@ -83,8 +83,7 @@
    "Releasing conference %p, total=%d\n",
    conference, --conf_count);
    - if (conference->guid)
    - g_free(conference->guid);
    + g_free(conference->guid);
    if (conference->participants) {
    for (node = conference->participants; node; node = node->next) {
    --- a/libpurple/protocols/novell/nmconn.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmconn.c Mon Dec 21 15:00:42 2015 -0500
    @@ -187,10 +187,8 @@
    }
    g_slist_free(conn->requests);
    conn->requests = NULL;
    - if (conn->ssl_conn) {
    - g_free(conn->ssl_conn);
    - conn->ssl_conn = NULL;
    - }
    + g_free(conn->ssl_conn);
    + conn->ssl_conn = NULL;
    g_free(conn->addr);
    conn->addr = NULL;
    g_free(conn);
    --- a/libpurple/protocols/novell/nmcontact.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmcontact.c Mon Dec 21 15:00:42 2015 -0500
    @@ -164,8 +164,7 @@
    nm_locate_field(NM_A_SZ_DISPLAY_NAME, (NMField *) fields->ptr_value))) {
    if (field->ptr_value) {
    - if (contact->display_name)
    - g_free(contact->display_name);
    + g_free(contact->display_name);
    contact->display_name = g_strdup((char *) field->ptr_value);
    }
    @@ -175,8 +174,7 @@
    if ((field = nm_locate_field(NM_A_SZ_DN, (NMField *) fields->ptr_value))) {
    if (field->ptr_value) {
    - if (contact->dn)
    - g_free(contact->dn);
    + g_free(contact->dn);
    contact->dn = g_strdup((char *) field->ptr_value);
    }
    @@ -303,10 +301,8 @@
    if (contact == NULL)
    return;
    - if (contact->display_name) {
    - g_free(contact->display_name);
    - contact->display_name = NULL;
    - }
    + g_free(contact->display_name);
    + contact->display_name = NULL;
    if (display_name)
    contact->display_name = g_strdup(display_name);
    @@ -318,10 +314,8 @@
    if (contact == NULL)
    return;
    - if (contact->dn) {
    - g_free(contact->dn);
    - contact->dn = NULL;
    - }
    + g_free(contact->dn);
    + contact->dn = NULL;
    if (dn)
    contact->dn = g_strdup(dn);
    @@ -538,8 +532,7 @@
    nm_locate_field(NM_A_SZ_DISPLAY_NAME, (NMField *) fields->ptr_value))) {
    if (field->ptr_value) {
    - if (folder->name)
    - g_free(folder->name);
    + g_free(folder->name);
    folder->name = g_strdup((char *) field->ptr_value);
    }
    @@ -640,8 +633,7 @@
    if (folder == NULL || name == NULL)
    return;
    - if (folder->name)
    - g_free(folder->name);
    + g_free(folder->name);
    folder->name = g_strdup(name);
    }
    --- a/libpurple/protocols/novell/nmevent.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmevent.c Mon Dec 21 15:00:42 2015 -0500
    @@ -241,14 +241,9 @@
    nm_release_conference(conference);
    }
    - if (msg)
    - g_free(msg);
    -
    - if (nortf)
    - g_free(nortf);
    -
    - if (guid)
    - g_free(guid);
    + g_free(msg);
    + g_free(nortf);
    + g_free(guid);
    return rc;
    }
    @@ -323,11 +318,8 @@
    }
    }
    - if (msg)
    - g_free(msg);
    -
    - if (guid)
    - g_free(guid);
    + g_free(msg);
    + g_free(guid);
    return rc;
    }
    @@ -381,8 +373,7 @@
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -417,8 +408,7 @@
    }
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -468,8 +458,7 @@
    }
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -507,8 +496,7 @@
    }
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -569,8 +557,7 @@
    }
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -605,8 +592,7 @@
    }
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -651,8 +637,7 @@
    }
    }
    - if (text)
    - g_free(text);
    + g_free(text);
    return rc;
    }
    @@ -677,8 +662,7 @@
    rc = nm_read_all(conn, guid, size);
    }
    - if (guid)
    - g_free(guid);
    + g_free(guid);
    return rc;
    }
    @@ -712,8 +696,7 @@
    if (--(event->ref_count) == 0) {
    - if (event->source)
    - g_free(event->source);
    + g_free(event->source);
    if (event->conference)
    nm_release_conference(event->conference);
    @@ -721,8 +704,7 @@
    if (event->user_record)
    nm_release_user_record(event->user_record);
    - if (event->text)
    - g_free(event->text);
    + g_free(event->text);
    g_free(event);
    }
    @@ -936,8 +918,7 @@
    }
    /* Cleanup */
    - if (source)
    - g_free(source);
    + g_free(source);
    return rc;
    }
    --- a/libpurple/protocols/novell/nmmessage.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmmessage.c Mon Dec 21 15:00:42 2015 -0500
    @@ -53,8 +53,7 @@
    nm_release_message(NMMessage * msg)
    {
    if (msg && (--(msg->ref_count) == 0)) {
    - if (msg->text)
    - g_free(msg->text);
    + g_free(msg->text);
    if (msg->conference)
    nm_release_conference(msg->conference);
    --- a/libpurple/protocols/novell/nmrequest.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmrequest.c Mon Dec 21 15:00:42 2015 -0500
    @@ -60,8 +60,7 @@
    nm_release_request(NMRequest * req)
    {
    if (req && (--req->ref_count == 0)) {
    - if (req->cmd)
    - g_free(req->cmd);
    + g_free(req->cmd);
    g_free(req);
    purple_debug_info("novell",
    --- a/libpurple/protocols/novell/nmuserrecord.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/nmuserrecord.c Mon Dec 21 15:00:42 2015 -0500
    @@ -191,64 +191,50 @@
    dest->status = src->status;
    /* Copy status text */
    - if (dest->status_text) {
    - g_free(dest->status_text);
    - dest->status_text = NULL;
    - }
    + g_free(dest->status_text);
    + dest->status_text = NULL;
    if (src->status_text)
    dest->status_text = g_strdup(src->status_text);
    /* Copy DN */
    - if (dest->dn) {
    - g_free(dest->dn);
    - dest->dn = NULL;
    - }
    + g_free(dest->dn);
    + dest->dn = NULL;
    if (src->dn)
    dest->dn = g_strdup(src->dn);
    /* Copy CN */
    - if (dest->cn) {
    - g_free(dest->cn);
    - dest->cn = NULL;
    - }
    + g_free(dest->cn);
    + dest->cn = NULL;
    if (src->cn)
    dest->cn = g_strdup(src->cn);
    /* Copy display id */
    - if (dest->display_id) {
    - g_free(dest->display_id);
    - dest->display_id = NULL;
    - }
    + g_free(dest->display_id);
    + dest->display_id = NULL;
    if (src->display_id)
    dest->display_id = g_strdup(src->display_id);
    /* Copy first name */
    - if (dest->fname) {
    - g_free(dest->fname);
    - dest->fname = NULL;
    - }
    + g_free(dest->fname);
    + dest->fname = NULL;
    if (src->fname)
    dest->fname = g_strdup(src->fname);
    /* Copy last name */
    - if (dest->lname) {
    - g_free(dest->lname);
    - dest->lname = NULL;
    - }
    + g_free(dest->lname);
    + dest->lname = NULL;
    if (src->lname)
    dest->lname = g_strdup(src->lname);
    /* Copy full name */
    - if (dest->full_name) {
    - g_free(dest->full_name);
    - dest->full_name = NULL;
    - }
    + g_free(dest->full_name);
    + dest->full_name = NULL;
    if (src->full_name)
    dest->full_name = g_strdup(src->full_name);
    @@ -321,8 +307,7 @@
    nm_user_record_set_dn(NMUserRecord * user_record, const char *dn)
    {
    if (user_record != NULL && dn != NULL) {
    - if (user_record->dn)
    - g_free(user_record->dn);
    + g_free(user_record->dn);
    user_record->dn = g_strdup(dn);
    }
    @@ -341,8 +326,7 @@
    nm_user_record_set_userid(NMUserRecord * user_record, const char *userid)
    {
    if (user_record != NULL && userid != NULL) {
    - if (user_record->cn)
    - g_free(user_record->cn);
    + g_free(user_record->cn);
    user_record->cn = g_strdup(userid);
    }
    @@ -361,8 +345,7 @@
    nm_user_record_set_display_id(NMUserRecord * user_record, const char *display_id)
    {
    if (user_record != NULL && display_id != NULL) {
    - if (user_record->display_id)
    - g_free(user_record->display_id);
    + g_free(user_record->display_id);
    user_record->display_id = g_strdup(display_id);
    }
    @@ -445,10 +428,8 @@
    user_record->status = status;
    - if (user_record->status_text) {
    - g_free(user_record->status_text);
    - user_record->status_text = NULL;
    - }
    + g_free(user_record->status_text);
    + user_record->status_text = NULL;
    if (text)
    user_record->status_text = g_strdup(text);
    @@ -512,11 +493,9 @@
    nm_release_property(NMProperty * property)
    {
    if (property) {
    - if (property->tag)
    - g_free(property->tag);
    + g_free(property->tag);
    - if (property->value)
    - g_free(property->value);
    + g_free(property->value);
    g_free(property);
    }
    --- a/libpurple/protocols/novell/novell.c Mon Dec 21 14:50:43 2015 -0500
    +++ b/libpurple/protocols/novell/novell.c Mon Dec 21 15:00:42 2015 -0500
    @@ -572,8 +572,7 @@
    if (user == NULL || folder_name == NULL || contact == NULL) {
    - if (folder_name)
    - g_free(folder_name);
    + g_free(folder_name);
    return;
    }
    @@ -606,8 +605,7 @@
    g_free(err);
    }
    - if (folder_name)
    - g_free(folder_name);
    + g_free(folder_name);
    }
    /* Add contact to newly create folder */
    @@ -625,8 +623,7 @@
    if (contact)
    nm_release_contact(contact);
    - if (folder_name)
    - g_free(folder_name);
    + g_free(folder_name);
    return;
    }
    @@ -724,8 +721,7 @@
    g_free(err);
    }
    - if (name)
    - g_free(name);
    + g_free(name);
    }
    /* Handle get details response add to privacy list */
    @@ -824,8 +820,7 @@
    }
    - if (who)
    - g_free(who);
    + g_free(who);
    }
    @@ -880,8 +875,7 @@
    }
    - if (who)
    - g_free(who);
    + g_free(who);
    }
    static void
    @@ -949,8 +943,7 @@
    g_free(err);
    }
    - if (who)
    - g_free(who);
    + g_free(who);
    }
    static void
    @@ -1678,8 +1671,7 @@
    {
    static char *name = NULL;
    - if (name)
    - g_free(name);
    + g_free(name);
    name = g_strdup_printf(_("GroupWise Conference %d"), id);
    @@ -3095,8 +3087,7 @@
    rc = nm_send_set_status(user, novellstatus, text, msg, NULL, NULL);
    _check_for_disconnect(user, rc);
    - if (text)
    - g_free(text);
    + g_free(text);
    }
    static void