pidgin/pidgin

oscar: Remove if() before g_free since g_free is NULL-aware
oscar_auth
2016-06-16, Youness Alaoui
e72f18aea857
Parents 669ec9305cb0
Children d2294123c226
oscar: Remove if() before g_free since g_free is NULL-aware
1 files changed, 10 insertions(+), 20 deletions(-)
  • +10 -20
    libpurple/protocols/oscar/kerberos.c
    • --- a/libpurple/protocols/oscar/kerberos.c Wed Jun 15 10:57:59 2016 -0400
    +++ b/libpurple/protocols/oscar/kerberos.c Thu Jun 16 13:09:22 2016 -0400
    @@ -93,8 +93,7 @@
    if (port != 443)
    port_str = g_strdup_printf (":%d", port);
    url = g_strdup_printf ("https://%s%s/", server, port_str ? port_str : "");
    - if (port_str)
    - g_free (port_str);
    + g_free (port_str);
    return url;
    }
    @@ -141,25 +140,18 @@
    {
    gint i;
    - if (xsnac->principal1)
    - g_free (xsnac->principal1);
    - if (xsnac->principal2)
    - g_free (xsnac->principal2);
    + g_free (xsnac->principal1);
    + g_free (xsnac->principal2);
    aim_tlvlist_free (xsnac->tlvlist);
    for (i = 0; i < xsnac->num_tokens; i++) {
    g_free(xsnac->tokens[i].main_tlv->value);
    g_free(xsnac->tokens[i].main_tlv);
    - if (xsnac->tokens[i].principal1)
    - g_free (xsnac->tokens[i].principal1);
    - if (xsnac->tokens[i].principal1_again)
    - if (xsnac->tokens[i].service)
    - g_free (xsnac->tokens[i].service);
    - g_free (xsnac->tokens[i].principal1_again);
    - if (xsnac->tokens[i].principal2)
    - g_free (xsnac->tokens[i].principal2);
    - if (xsnac->tokens[i].footer)
    - g_free (xsnac->tokens[i].footer);
    + g_free (xsnac->tokens[i].principal1);
    + g_free (xsnac->tokens[i].service);
    + g_free (xsnac->tokens[i].principal1_again);
    + g_free (xsnac->tokens[i].principal2);
    + g_free (xsnac->tokens[i].footer);
    aim_tlvlist_free (xsnac->tokens[i].tlvlist);
    }
    g_free (xsnac->tokens);
    @@ -315,10 +307,8 @@
    _("Unknown error during authentication"));
    }
    aim_xsnac_free (&xsnac);
    - if (tlsCertName)
    - g_free (tlsCertName);
    - if (bosip)
    - g_free (bosip);
    + g_free (tlsCertName);
    + g_free (bosip);
    }
    /**