pidgin/pidgin

Use g_strcmp0() for code simplification
string-comparison-r2
2017-03-24, qarkai
653645acccc8
Parents dcada91c0912
Children 8c0b26d1d508
Use g_strcmp0() for code simplification
3 files changed, 19 insertions(+), 27 deletions(-)
  • +1 -2
    libpurple/protocols/jabber/google/gmail.c
  • +9 -15
    libpurple/protocols/jabber/jabber.c
  • +9 -10
    pidgin/gtkconv.c
    • --- a/libpurple/protocols/jabber/google/gmail.c Fri Mar 24 12:29:27 2017 +0300
    +++ b/libpurple/protocols/jabber/google/gmail.c Fri Mar 24 13:01:08 2017 +0300
    @@ -116,8 +116,7 @@
    urls[i] = url;
    tid = xmlnode_get_attrib(message, "tid");
    - if (tid &&
    - (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
    + if (g_strcmp0(tid, js->gmail_last_tid) > 0) {
    g_free(js->gmail_last_tid);
    js->gmail_last_tid = g_strdup(tid);
    }
    --- a/libpurple/protocols/jabber/jabber.c Fri Mar 24 12:29:27 2017 +0300
    +++ b/libpurple/protocols/jabber/jabber.c Fri Mar 24 13:01:08 2017 +0300
    @@ -2023,23 +2023,17 @@
    ac = a;
    bc = b;
    - if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) {
    - if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) {
    - if (!ac->lang && !bc->lang) {
    - return 0;
    - } else if (ac->lang && !bc->lang) {
    - return 1;
    - } else if (!ac->lang && bc->lang) {
    - return -1;
    - } else {
    - return strcmp(ac->lang, bc->lang);
    - }
    - } else {
    - return typ_cmp;
    - }
    - } else {
    + cat_cmp = strcmp(ac->category, bc->category);
    + if (cat_cmp != 0) {
    return cat_cmp;
    }
    +
    + typ_cmp = strcmp(ac->type, bc->type);
    + if (typ_cmp != 0) {
    + return typ_cmp;
    + }
    +
    + return g_strcmp0(ac->lang, bc->lang);
    }
    void jabber_add_identity(const gchar *category, const gchar *type,
    --- a/pidgin/gtkconv.c Fri Mar 24 12:29:27 2017 +0300
    +++ b/pidgin/gtkconv.c Fri Mar 24 13:01:08 2017 +0300
    @@ -4370,16 +4370,15 @@
    f2 &= PURPLE_CBFLAGS_VOICE | PURPLE_CBFLAGS_HALFOP | PURPLE_CBFLAGS_OP |
    PURPLE_CBFLAGS_FOUNDER;
    - if (user1 == NULL || user2 == NULL) {
    - if (!(user1 == NULL && user2 == NULL))
    - ret = (user1 == NULL) ? -1: 1;
    - } else if (f1 != f2) {
    - /* sort more important users first */
    - ret = (f1 > f2) ? -1 : 1;
    - } else if (buddy1 != buddy2) {
    - ret = (buddy1 > buddy2) ? -1 : 1;
    - } else {
    - ret = strcmp(user1, user2);
    + ret = g_strcmp0(user1, user2);
    +
    + if (user1 != NULL && user2 != NULL) {
    + if (f1 != f2) {
    + /* sort more important users first */
    + ret = (f1 > f2) ? -1 : 1;
    + } else if (buddy1 != buddy2) {
    + ret = (buddy1 > buddy2) ? -1 : 1;
    + }
    }
    g_free(user1);