Convert (hopefully) all comparisons to NULL

Apply badzero.cocci, badnull.coci and badnull2.cocci

This should convert all cases where there's a comparison to NULL to simpler
forms. This patch applies the following transformations:

code before patch               ||code after patch
===============================================================

return a == NULL;                 return !a;

return a != NULL;                 return !!a;

func(a == NULL);                  func(!a);

func(a != NULL);                  func(!!a);

b = a == NULL;                    b = !a;

b = a != NULL;                    b = !!a;

b = a == NULL ? c : d;            b = !a ? c : d;

b = a != NULL ? c : d;            b = a ? c : d;

other cases:

a == NULL                         !a
a != NULL                         a

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@51487 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/include/eina_safety_checks.h b/src/include/eina_safety_checks.h
index 79ebc54..29ebba0 100644 (file)
--- a/src/include/eina_safety_checks.h
+++ b/src/include/eina_safety_checks.h
@@ -196,10 +196,10 @@ EAPI extern Eina_Error EINA_ERROR_SAFETY_FAILED;
 #else /* no safety checks */
 
 #define EINA_SAFETY_ON_NULL_RETURN(exp)                \
-  do { (void)((exp) == NULL); } while (0)
+  do { (void)(!(exp)); } while (0)
 
 #define EINA_SAFETY_ON_NULL_RETURN_VAL(exp, val)               \
-  do { if (0 && (exp) == NULL) { (void)val; } } while (0)
+  do { if (0 && !(exp)) { (void)val; } } while (0)
 
 #define EINA_SAFETY_ON_NULL_GOTO(exp, label)                   \
   do { if (0 && (exp) == NULL) { goto label; } } while (0)

diff --git a/src/lib/eina_file.c b/src/lib/eina_file.c
index 0e3a3df..8c75c4c 100644 (file)
--- a/src/lib/eina_file.c
+++ b/src/lib/eina_file.c
@@ -375,7 +375,7 @@ eina_file_split(char *path)
       return NULL;
 
    for (current = strchr(path, PATH_DELIM);
-        current != NULL;
+        current;
         path = current + 1, current = strchr(path, PATH_DELIM))
      {
         length = current - path;

diff --git a/src/lib/eina_hash.c b/src/lib/eina_hash.c
index 076a407..0d95e42 100644 (file)
--- a/src/lib/eina_hash.c
+++ b/src/lib/eina_hash.c
@@ -603,7 +603,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
    if (!(it->index < it->hash->population))
       return EINA_FALSE;
 
-   if (it->current == NULL)
+   if (!it->current)
      {
         ok = EINA_FALSE;
         bucket = 0;
@@ -638,7 +638,7 @@ _eina_hash_iterator_next(Eina_Iterator_Hash *it, void **data)
      {
         while (bucket < it->hash->size)
           {
-             if (it->hash->buckets[bucket] != NULL)
+             if (it->hash->buckets[bucket])
                {
                   it->current =
                      eina_rbtree_iterator_prefix(it->hash->buckets[bucket]);

diff --git a/src/lib/eina_inlist.c b/src/lib/eina_inlist.c
index 82873b7..c7403a3 100644 (file)
--- a/src/lib/eina_inlist.c
+++ b/src/lib/eina_inlist.c
@@ -63,7 +63,7 @@ struct _Eina_Accessor_Inlist
 
 static Eina_Bool
 eina_inlist_iterator_next(Eina_Iterator_Inlist *it, void **data) {
-   if (it->current == NULL)
+   if (!it->current)
       return EINA_FALSE;
 
    if (data)
@@ -97,7 +97,7 @@ eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it,
    else if (idx > it->index)
       /* Looking after current. */
       for (i = it->index, over = it->current;
-           i < idx && over != NULL;
+           i < idx && over;
            ++i, over = over->next)
          ;
    else
@@ -107,18 +107,18 @@ eina_inlist_accessor_get_at(Eina_Accessor_Inlist *it,
         if (idx > middle)
            /* Looking backward from current. */
            for (i = it->index, over = it->current;
-                i > idx && over != NULL;
+                i > idx && over;
                 --i, over = over->prev)
               ;
         else
            /* Looking from the start. */
            for (i = 0, over = it->head;
-                i < idx && over != NULL;
+                i < idx && over;
                 ++i, over = over->next)
               ;
      }
 
-   if (over == NULL)
+   if (!over)
       return EINA_FALSE;
 
    it->current = over;
@@ -437,7 +437,7 @@ eina_inlist_remove(Eina_Inlist *list, Eina_Inlist *item)
    EINA_SAFETY_ON_NULL_RETURN_VAL(list, NULL);
    EINA_SAFETY_ON_NULL_RETURN_VAL(item, list);
    EINA_SAFETY_ON_TRUE_RETURN_VAL
-      ((item != list) && (item->prev == NULL) && (item->next == NULL), list);
+      ((item != list) && (!item->prev) && (!item->next), list);
 
    if (item->next)
       item->next->prev = item->prev;

diff --git a/src/lib/eina_list.c b/src/lib/eina_list.c
index 2b140d2..1b05e4f 100644 (file)
--- a/src/lib/eina_list.c
+++ b/src/lib/eina_list.c
@@ -272,7 +272,7 @@ eina_list_iterator_next(Eina_Iterator_List *it, void **data)
 {
    EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
 
-   if (it->current == NULL)
+   if (!it->current)
       return EINA_FALSE;
 
    *data = eina_list_data_get(it->current);
@@ -287,7 +287,7 @@ eina_list_iterator_prev(Eina_Iterator_List *it, void **data)
 {
    EINA_MAGIC_CHECK_LIST_ITERATOR(it, EINA_FALSE);
 
-   if (it->current == NULL)
+   if (!it->current)
       return EINA_FALSE;
 
    *data = eina_list_data_get(it->current);
@@ -336,13 +336,13 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int idx, void **data)
            /* Go backward from the end. */
            for (i = eina_list_count(it->head) - 1,
                 over = eina_list_last(it->head);
-                i > idx && over != NULL;
+                i > idx && over;
                 --i, over = eina_list_prev(over))
               ;
         else
            /* Go forward from current. */
            for (i = it->index, over = it->current;
-                i < idx && over != NULL;
+                i < idx && over;
                 ++i, over = eina_list_next(over))
               ;
      }
@@ -354,18 +354,18 @@ eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int idx, void **data)
         if (idx > middle)
            /* Go backward from current. */
            for (i = it->index, over = it->current;
-                i > idx && over != NULL;
+                i > idx && over;
                 --i, over = eina_list_prev(over))
               ;
         else
            /* Go forward from start. */
            for (i = 0, over = it->head;
-                i < idx && over != NULL;
+                i < idx && over;
                 ++i, over = eina_list_next(over))
               ;
      }
 
-   if (over == NULL)
+   if (!over)
       return EINA_FALSE;
 
    it->current = over;

diff --git a/src/lib/eina_log.c b/src/lib/eina_log.c
index f8af3b9..97d652b 100644 (file)
--- a/src/lib/eina_log.c
+++ b/src/lib/eina_log.c
@@ -2373,19 +2373,19 @@ eina_log_print(int domain, Eina_Log_Level level, const char *file,
    va_list args;
 
 #ifdef EINA_SAFETY_CHECKS
-   if (EINA_UNLIKELY(file == NULL))
+   if (EINA_UNLIKELY(!file))
      {
         fputs("ERR: eina_log_print() file == NULL\n", stderr);
         return;
      }
 
-   if (EINA_UNLIKELY(fnc == NULL))
+   if (EINA_UNLIKELY(!fnc))
      {
         fputs("ERR: eina_log_print() fnc == NULL\n", stderr);
         return;
      }
 
-   if (EINA_UNLIKELY(fmt == NULL))
+   if (EINA_UNLIKELY(!fmt))
      {
         fputs("ERR: eina_log_print() fmt == NULL\n", stderr);
         return;
@@ -2428,19 +2428,19 @@ eina_log_vprint(int domain, Eina_Log_Level level, const char *file,
                 const char *fnc, int line, const char *fmt, va_list args)
 {
 #ifdef EINA_SAFETY_CHECKS
-   if (EINA_UNLIKELY(file == NULL))
+   if (EINA_UNLIKELY(!file))
      {
         fputs("ERR: eina_log_print() file == NULL\n", stderr);
         return;
      }
 
-   if (EINA_UNLIKELY(fnc == NULL))
+   if (EINA_UNLIKELY(!fnc))
      {
         fputs("ERR: eina_log_print() fnc == NULL\n", stderr);
         return;
      }
 
-   if (EINA_UNLIKELY(fmt == NULL))
+   if (EINA_UNLIKELY(!fmt))
      {
         fputs("ERR: eina_log_print() fmt == NULL\n", stderr);
         return;

diff --git a/src/lib/eina_matrixsparse.c b/src/lib/eina_matrixsparse.c
index 4857a53..a12c74a 100644 (file)
--- a/src/lib/eina_matrixsparse.c
+++ b/src/lib/eina_matrixsparse.c
@@ -429,7 +429,7 @@ _eina_matrixsparse_row_idx_get(const Eina_Matrixsparse *m, unsigned long row)
    assert(dir != 0);
    if (dir > 0)
      {
-        for (; r != NULL; r = r->next)
+        for (; r; r = r->next)
            if (r->row == row)
              {
                 ((Eina_Matrixsparse *)m)->last_used = r;
@@ -440,7 +440,7 @@ _eina_matrixsparse_row_idx_get(const Eina_Matrixsparse *m, unsigned long row)
 
      }
    else if (dir < 0)
-      for (; r != NULL; r = r->prev)
+      for (; r; r = r->prev)
          if (r->row == row)
            {
               ((Eina_Matrixsparse *)m)->last_used = r;
@@ -479,7 +479,7 @@ _eina_matrixsparse_row_cell_idx_get(const Eina_Matrixsparse_Row *r,
    assert(dir != 0);
    if (dir > 0)
      {
-        for (; r != NULL; c = c->next)
+        for (; r; c = c->next)
            if (c->col == col)
              {
                 ((Eina_Matrixsparse_Row *)r)->last_used = c;
@@ -490,7 +490,7 @@ _eina_matrixsparse_row_cell_idx_get(const Eina_Matrixsparse_Row *r,
 
      }
    else if (dir < 0)
-      for (; r != NULL; c = c->prev)
+      for (; r; c = c->prev)
          if (c->col == col)
            {
               ((Eina_Matrixsparse_Row *)r)->last_used = c;
@@ -527,21 +527,21 @@ _eina_matrixsparse_row_idx_siblings_find(const Eina_Matrixsparse *m,
         assert(dir != 0);
    if (dir > 0)
      {
-        for (; r != NULL; r = r->next)
+        for (; r; r = r->next)
            if (r->row > row)
               break;
 
-        assert(r != NULL);
+        assert(!!r);
         *p_prev = r->prev;
         *p_next = r;
      }
    else if (dir < 0)
      {
-        for (; r != NULL; r = r->prev)
+        for (; r; r = r->prev)
            if (r->row < row)
               break;
 
-        assert(r != NULL);
+        assert(!!r);
         *p_prev = r;
         *p_next = r->next;
      }
@@ -560,21 +560,21 @@ _eina_matrixsparse_row_cell_idx_siblings_find(const Eina_Matrixsparse_Row *r,
         assert(dir != 0);
    if (dir > 0)
      {
-        for (; c != NULL; c = c->next)
+        for (; c; c = c->next)
            if (c->col > col)
               break;
 
-        assert(c != NULL);
+        assert(!!c);
         *p_prev = c->prev;
         *p_next = c;
      }
    else if (dir < 0)
      {
-        for (; c != NULL; c = c->prev)
+        for (; c; c = c->prev)
            if (c->col < col)
               break;
 
-        assert(c != NULL);
+        assert(!!c);
         *p_prev = c;
         *p_next = c->next;
      }
@@ -613,8 +613,8 @@ _eina_matrixsparse_row_idx_add(Eina_Matrixsparse *m, unsigned long row)
      {
         Eina_Matrixsparse_Row *prev = NULL, *next = NULL;
         _eina_matrixsparse_row_idx_siblings_find(m, row, &prev, &next);
-        assert(prev != NULL);
-        assert(next != NULL);
+        assert(!!prev);
+        assert(!!next);
         r->prev = prev;
         r->next = next;
         prev->next = r;
@@ -666,8 +666,8 @@ _eina_matrixsparse_row_cell_idx_add(Eina_Matrixsparse_Row *r,
      {
         Eina_Matrixsparse_Cell *prev = NULL, *next = NULL;
         _eina_matrixsparse_row_cell_idx_siblings_find(r, col, &prev, &next);
-        assert(prev != NULL);
-        assert(next != NULL);
+        assert(!!prev);
+        assert(!!next);
         c->prev = prev;
         c->next = next;
         prev->next = c;
@@ -758,7 +758,7 @@ _eina_matrixsparse_iterator_complete_next(
    if (it->idx.row >= it->m->size.rows)
       return 0;
 
-   if (it->dummy.col.data != NULL)
+   if (it->dummy.col.data)
       ERR("Last iterator call changed dummy cell!");
 
    if ((it->ref.col) &&
@@ -806,7 +806,7 @@ _eina_matrixsparse_iterator_complete_free(
 {
       EINA_MAGIC_CHECK_MATRIXSPARSE_ITERATOR(it);
 
-   if (it->dummy.col.data != NULL)
+   if (it->dummy.col.data)
       ERR("Last iterator call changed dummy cell!");
 
    EINA_MAGIC_SET(it,            EINA_MAGIC_NONE);
@@ -1478,7 +1478,7 @@ eina_matrixsparse_column_idx_clear(Eina_Matrixsparse *m, unsigned long col)
    free_func = m->free.func;
    user_data = m->free.user_data;
 
-   for (r = m->rows; r != NULL; )
+   for (r = m->rows; r; )
      {
         Eina_Matrixsparse_Row *r_aux = r;
         Eina_Matrixsparse_Cell *c;

diff --git a/src/lib/eina_rbtree.c b/src/lib/eina_rbtree.c
index 6d4130b..7e69d2c 100644 (file)
--- a/src/lib/eina_rbtree.c
+++ b/src/lib/eina_rbtree.c
@@ -116,11 +116,11 @@ _eina_rbtree_iterator_next(Eina_Iterator_Rbtree *it, void **data)
    last = eina_array_data_get(it->stack, eina_array_count_get(it->stack) - 1);
    tree = last->tree;
 
-   if (last->tree == NULL || last->up == EINA_TRUE)
+   if (!last->tree || last->up == EINA_TRUE)
      {
         last = eina_array_pop(it->stack);
         while (last->dir == EINA_RBTREE_LEFT
-               || last->tree == NULL)
+               || !last->tree)
           {
              if (tree)
                 if ((it->mask & EINA_RBTREE_ITERATOR_POSTFIX_MASK) ==
@@ -242,7 +242,7 @@ _eina_rbtree_node_init(Eina_Rbtree *node)
 static inline Eina_Bool
 _eina_rbtree_is_red(Eina_Rbtree *node)
 {
-   return node != NULL && node->color == EINA_RBTREE_RED;
+   return !!node && node->color == EINA_RBTREE_RED;
 }
 
 static inline Eina_Rbtree *
@@ -317,7 +317,7 @@ eina_rbtree_inline_insert(Eina_Rbtree *root,
    /* Search down the tree */
    for (;; )
      {
-        if (q == NULL)
+        if (!q)
            /* Insert new node at the bottom */
            p->son[dir] = q = node;
         else if (_eina_rbtree_is_red(q->son[0])
@@ -350,7 +350,7 @@ eina_rbtree_inline_insert(Eina_Rbtree *root,
         dir = cmp(q, node, (void *)data);
 
         /* Update helpers */
-        if ( g != NULL )
+        if ( g )
            t = g;
 
         g = p, p = q;
@@ -391,7 +391,7 @@ eina_rbtree_inline_remove(Eina_Rbtree *root,
    q->son[EINA_RBTREE_RIGHT] = root;
 
    /* Search and push a red down */
-   while (q->son[dir] != NULL)
+   while (q->son[dir])
      {
         Eina_Rbtree_Direction last = dir;
         Eina_Rbtree *g;
@@ -415,7 +415,7 @@ eina_rbtree_inline_remove(Eina_Rbtree *root,
                {
                   Eina_Rbtree *s = p->son[!last];
 
-                  if (s != NULL)
+                  if (s)
                     {
                        if (!_eina_rbtree_is_red(s->son[EINA_RBTREE_LEFT])
                            && !_eina_rbtree_is_red(s->son[EINA_RBTREE_RIGHT]))
@@ -466,13 +466,13 @@ eina_rbtree_inline_remove(Eina_Rbtree *root,
      }
 
    /* Replace and remove if found */
-   if (f != NULL)
+   if (f)
      {
         /* 'q' should take the place of 'node' parent */
         f->son[f->son[1] == node] = q;
 
         /* Switch the link from the parent to q's son */
-        p->son[p->son[1] == q] = q->son[q->son[0] == NULL];
+        p->son[p->son[1] == q] = q->son[!q->son[0]];
 
         /* Put q at the place of node */
         q->son[0] = node->son[0];
@@ -485,7 +485,7 @@ eina_rbtree_inline_remove(Eina_Rbtree *root,
      }
 
    root = head.son[1];
-   if (root != NULL)
+   if (root)
       root->color = EINA_RBTREE_BLACK;
 
    return root;

diff --git a/src/lib/eina_share_common.c b/src/lib/eina_share_common.c
index 876b1ee..dcc99c2 100644 (file)
--- a/src/lib/eina_share_common.c
+++ b/src/lib/eina_share_common.c
@@ -492,7 +492,7 @@ _eina_share_common_head_find(Eina_Share_Common_Head *head,
 
    prev = node;
    node = node->next;
-   for (; node != NULL; prev = node, node = node->next)
+   for (; node; prev = node, node = node->next)
       if (_eina_share_common_node_eq(node, str, slen))
         {
            /* promote node, make hot items be at the beginning */
@@ -519,7 +519,7 @@ _eina_share_common_head_remove_node(Eina_Share_Common_Head *head,
 
    prev = head->head;
    cur = head->head->next;
-   for (; cur != NULL; prev = cur, cur = cur->next)
+   for (; cur; prev = cur, cur = cur->next)
       if (cur == node)
         {
            prev->next = cur->next;

diff --git a/src/lib/eina_tiler.c b/src/lib/eina_tiler.c
index 9d3f4cb..2d263b7 100644 (file)
--- a/src/lib/eina_tiler.c
+++ b/src/lib/eina_tiler.c
@@ -920,7 +920,7 @@ static void rect_list_merge_rects(list_t *rects,
         merged = 0;
         parent_node = NULL;
         node = rects->head;
-        while (node != NULL)
+        while (node)
           {
              rect_t r2, outer;
              int area;
@@ -1067,7 +1067,7 @@ static Eina_Bool _iterator_next(Eina_Iterator_Tiler *it, void **data)
    Eina_Rectangle *rect = (Eina_Rectangle *)data;
    list_node_t *n;
 
-   for (n = it->curr; n != NULL; n = n->next)
+   for (n = it->curr; n; n = n->next)
      {
         rect_t cur;
 

diff --git a/src/tests/ecore_list.c b/src/tests/ecore_list.c
index f6ac49c..7da4417 100644 (file)
--- a/src/tests/ecore_list.c
+++ b/src/tests/ecore_list.c
@@ -240,7 +240,7 @@ _ecore_list_append_0(Ecore_List *list, Ecore_List_Node *end)
 
    list->last = end;
 
-   if (list->first == NULL)
+   if (!list->first)
      {
         list->first = end;
         list->index = 0;
@@ -288,7 +288,7 @@ _ecore_list_prepend_0(Ecore_List *list, Ecore_List_Node *start)
    list->first = start;
 
    /* If no last node, then the first node is the last node */
-   if (list->last == NULL)
+   if (!list->last)
       list->last = list->first;
 
    list->nodes++;
@@ -331,7 +331,7 @@ _ecore_list_insert(Ecore_List *list, Ecore_List_Node *new_node)
    if (list->current == list->first)
       return _ecore_list_prepend_0(list, new_node);
 
-   if (list->current == NULL)
+   if (!list->current)
      {
         int ret_value;
 
@@ -942,7 +942,7 @@ _ecore_list_for_each(Ecore_List *list, Ecore_For_Each function, void *user_data)
       return FALSE;
 
    _ecore_list_first_goto(list);
-   while ((value = _ecore_list_next(list)) != NULL)
+   while ((value = _ecore_list_next(list)))
       function(value, user_data);
 
    return TRUE;
@@ -976,7 +976,7 @@ _ecore_list_find(Ecore_List *list,
       return NULL;
 
    _ecore_list_first_goto(list);
-   while ((value = _ecore_list_current(list)) != NULL)
+   while ((value = _ecore_list_current(list)))
      {
         if (!function(value, user_data))
            return value;

diff --git a/src/tests/eina_bench.c b/src/tests/eina_bench.c
index e971873..5015327 100644 (file)
--- a/src/tests/eina_bench.c
+++ b/src/tests/eina_bench.c
@@ -83,7 +83,7 @@ main(int argc, char **argv)
 
    eina_init();
 
-   for (i = 0; etc[i].bench_case != NULL; ++i)
+   for (i = 0; etc[i].bench_case; ++i)
      {
         test = eina_benchmark_new(etc[i].bench_case, argv[1]);
         if (!test)

diff --git a/src/tests/eina_suite.c b/src/tests/eina_suite.c
index 78a014f..15d8ff8 100644 (file)
--- a/src/tests/eina_suite.c
+++ b/src/tests/eina_suite.c
@@ -70,7 +70,7 @@ _list_tests(void)
 {
    const Eina_Test_Case *itr = etc;
       fputs("Available Test Cases:\n", stderr);
-   for (; itr->test_case != NULL; itr++)
+   for (; itr->test_case; itr++)
       fprintf(stderr, "\t%s\n", itr->test_case);
 }
 
@@ -96,7 +96,7 @@ eina_build_suite(int argc, const char **argv)
 
    s = suite_create("Eina");
 
-   for (i = 0; etc[i].test_case != NULL; ++i)
+   for (i = 0; etc[i].test_case; ++i)
      {
         if (!_use_test(argc, argv, etc[i].test_case))
            continue;

diff --git a/src/tests/eina_test_binshare.c b/src/tests/eina_test_binshare.c
index b6c4c79..8dab062 100644 (file)
--- a/src/tests/eina_test_binshare.c
+++ b/src/tests/eina_test_binshare.c
@@ -85,8 +85,8 @@ START_TEST(eina_binshare_small)
         t0 = eina_binshare_add_length(buf, i);
         t1 = eina_binshare_add_length(buf, i);
 
-        fail_if(t0 == NULL);
-        fail_if(t1 == NULL);
+        fail_if(!t0);
+        fail_if(!t1);
         fail_if(t0 != t1);
         fail_if(memcmp(t0, buf, i) != 0);
 
@@ -110,8 +110,8 @@ START_TEST(eina_binshare_test_share)
    t0 = eina_binshare_add_length(TEST0, TEST0_SIZE);
    t1 = eina_binshare_add_length(TEST0, TEST0_SIZE);
 
-   fail_if(t0 == NULL);
-   fail_if(t1 == NULL);
+   fail_if(!t0);
+   fail_if(!t1);
    fail_if(memcmp(t0, TEST0, TEST0_SIZE) != 0);
    fail_if(memcmp(t1, TEST0, TEST0_SIZE) != 0);
    fail_if(t0 != t1);
@@ -168,7 +168,7 @@ START_TEST(eina_binshare_collision)
         if (rand() > RAND_MAX / 2)
           {
              const char *r = eina_binshare_add_length(buffer, strlen(buffer));
-             fail_if(r == NULL);
+             fail_if(!r);
           }
      }
 
@@ -180,9 +180,9 @@ START_TEST(eina_binshare_collision)
         eina_array_push(ea,
                         (void *)eina_binshare_add_length(buffer, strlen(buffer)));
         r = eina_binshare_add_length(buffer, strlen(buffer));
-        fail_if(r == NULL);
+        fail_if(!r);
         r = eina_binshare_add_length(buffer, strlen(buffer));
-        fail_if(r == NULL);
+        fail_if(!r);
      }
 
    for (i = 0; i < 200; ++i)

diff --git a/src/tests/eina_test_hash.c b/src/tests/eina_test_hash.c
index aeeb655..ac6ee76 100644 (file)
--- a/src/tests/eina_test_hash.c
+++ b/src/tests/eina_test_hash.c
@@ -111,7 +111,7 @@ START_TEST(eina_hash_extended)
         fail_if(eina_init() != 2);
 
    hash = eina_hash_string_djb2_new(NULL);
-        fail_if(hash == NULL);
+        fail_if(!hash);
 
         fail_if(eina_hash_direct_add(hash, "42", "42") != EINA_TRUE);
 
@@ -123,7 +123,7 @@ START_TEST(eina_hash_extended)
         fail_if(eina_hash_direct_add(hash, tmp, tmp) != EINA_TRUE);
      }
 
-        fail_if(eina_hash_find(hash, "42") == NULL);
+        fail_if(!eina_hash_find(hash, "42"));
 
         eina_hash_free(hash);
 
@@ -140,7 +140,7 @@ START_TEST(eina_hash_double_item)
    fail_if(eina_init() != 2);
 
    hash = eina_hash_string_superfast_new(NULL);
-   fail_if(hash == NULL);
+   fail_if(!hash);
 
    fail_if(eina_hash_add(hash, "7", &i[0]) != EINA_TRUE);
    fail_if(eina_hash_add(hash, "7", &i[1]) != EINA_TRUE);
@@ -167,7 +167,7 @@ START_TEST(eina_hash_all_int)
       fail_if(eina_init() != 2);
 
    hash = eina_hash_int32_new(NULL);
-      fail_if(hash == NULL);
+      fail_if(!hash);
 
    for (it = 0; it < 4; ++it)
       fail_if(eina_hash_add(hash, &i[it], &i[it]) != EINA_TRUE);
@@ -182,7 +182,7 @@ START_TEST(eina_hash_all_int)
       eina_hash_free(hash);
 
    hash = eina_hash_int64_new(NULL);
-      fail_if(hash == NULL);
+      fail_if(!hash);
 
    for (it = 0; it < 4; ++it)
       fail_if(eina_hash_add(hash, &j[it], &j[it]) != EINA_TRUE);

diff --git a/src/tests/eina_test_list.c b/src/tests/eina_test_list.c
index 6e08847..eef1965 100644 (file)
--- a/src/tests/eina_test_list.c
+++ b/src/tests/eina_test_list.c
@@ -220,39 +220,39 @@ START_TEST(eina_test_merge)
    l1 = eina_list_append(l1, &data[1]);
    l1 = eina_list_append(l1, &data[2]);
    l1 = eina_list_append(l1, &data[3]);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
 
    l2 = eina_list_append(NULL, &data[4]);
    l2 = eina_list_append(l2, &data[5]);
-      fail_if(l2 == NULL);
+      fail_if(!l2);
 
    l1 = eina_list_merge(l1, l2);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
       fail_if(eina_list_count(l1) != 6);
-   for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
+   for (i = 0, l2 = l1; ((l2) && (i < 6)); ++i, l2 = l2->next)
       fail_if(l2->data != &data[i]);
       fail_if(i != 6);
-      fail_if(l2 != NULL);
+      fail_if(!!l2);
 
       eina_list_free(l1);
 
    l1 = eina_list_append(NULL, &data[0]);
    l1 = eina_list_append(l1, &data[1]);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
 
    l2 = eina_list_append(NULL, &data[2]);
    l2 = eina_list_append(l2, &data[3]);
    l2 = eina_list_append(l2, &data[4]);
    l2 = eina_list_append(l2, &data[5]);
-      fail_if(l2 == NULL);
+      fail_if(!l2);
 
    l1 = eina_list_merge(l1, l2);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
       fail_if(eina_list_count(l1) != 6);
-   for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next)
+   for (i = 0, l2 = l1; ((l2) && (i < 6)); ++i, l2 = l2->next)
       fail_if(l2->data != &data[i]);
       fail_if(i != 6);
-      fail_if(l2 != NULL);
+      fail_if(!!l2);
 
    l3 = eina_list_append(NULL, &data[6]);
    l3 = eina_list_append(l3, &data[7]);
@@ -272,15 +272,15 @@ START_TEST(eina_test_merge)
    l5 = eina_list_sort(l5, -1, eina_int_cmp);
 
    l1 = eina_list_sorted_merge(l1, l3, eina_int_cmp);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
       fail_if(eina_list_count(l1) != 9);
 
    l1 = eina_list_sorted_merge(l1, l4, eina_int_cmp);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
       fail_if(eina_list_count(l1) != 12);
 
    l1 = eina_list_sorted_merge(l1, l5, eina_int_cmp);
-      fail_if(l1 == NULL);
+      fail_if(!l1);
       fail_if(eina_list_count(l1) != 15);
 
       fail_if(!eina_list_sorted_check(l1));
@@ -305,14 +305,14 @@ START_TEST(eina_test_sorted_insert)
    for (i = 0; i < count; i++)
       l1 = eina_list_sorted_insert(l1, eina_int_cmp, data + i);
 
-   fail_if(l1 == NULL);
+   fail_if(!l1);
    fail_if(!eina_list_sorted_check(l1));
 
    l2 = NULL;
    EINA_LIST_FOREACH(l1, itr, d)
    l2 = eina_list_sorted_insert(l2, eina_int_cmp, d);
 
-   fail_if(l2 == NULL);
+   fail_if(!l2);
    fail_if(!eina_list_sorted_check(l2));
    eina_list_free(l2);
 
@@ -320,7 +320,7 @@ START_TEST(eina_test_sorted_insert)
    EINA_LIST_REVERSE_FOREACH(l1, itr, d)
    l2 = eina_list_sorted_insert(l2, eina_int_cmp, d);
 
-   fail_if(l2 == NULL);
+   fail_if(!l2);
    fail_if(!eina_list_sorted_check(l2));
    eina_list_free(l2);
    eina_list_free(l1);
@@ -330,7 +330,7 @@ START_TEST(eina_test_sorted_insert)
    for (i = 0; i < count; i++)
       l1 = eina_list_sorted_insert(l1, eina_int_cmp, data2 + i);
 
-   fail_if(l1 == NULL);
+   fail_if(!l1);
    fail_if(!eina_list_sorted_check(l1));
    eina_list_free(l1);
 

diff --git a/src/tests/eina_test_matrixsparse.c b/src/tests/eina_test_matrixsparse.c
index e07b1ee..3f529a8 100644 (file)
--- a/src/tests/eina_test_matrixsparse.c
+++ b/src/tests/eina_test_matrixsparse.c
@@ -286,7 +286,7 @@ START_TEST(eina_test_resize)
 
    matrix = eina_matrixsparse_new(MAX_ROWS, MAX_COLS,
                                   eina_matrixsparse_free_cell_cb, data);
-   fail_if(matrix == NULL);
+   fail_if(!matrix);
 
    /* cell insertion */
    data[0][5] = 5;
@@ -408,7 +408,7 @@ START_TEST(eina_test_iterators)
 
    matrix = eina_matrixsparse_new(MAX_ROWS, MAX_COLS,
                                   eina_matrixsparse_free_cell_cb, data);
-   fail_if(matrix == NULL);
+   fail_if(!matrix);
 
    r = eina_matrixsparse_data_idx_set(matrix, 3, 5, &data[3][5]);
    fail_if(r == EINA_FALSE);
@@ -448,23 +448,23 @@ START_TEST(eina_test_iterators)
    fail_if(r == EINA_FALSE);
 
    it = eina_matrixsparse_iterator_new(matrix);
-   fail_if(it == NULL);
+   fail_if(!it);
    EINA_ITERATOR_FOREACH(it, cell)
    {
-      fail_if(cell == NULL);
+      fail_if(!cell);
       r = eina_matrixsparse_cell_position_get(cell, &row, &col);
       fail_if(r == EINA_FALSE);
 
       test1 = eina_matrixsparse_cell_data_get(cell);
-      fail_if(test1 == NULL || *test1 != data[row][col]);
+      fail_if(!test1 || *test1 != data[row][col]);
    }
       eina_iterator_free(it);
 
    it = eina_matrixsparse_iterator_complete_new(matrix);
-   fail_if(it == NULL);
+   fail_if(!it);
    EINA_ITERATOR_FOREACH(it, cell)
    {
-         fail_if(cell == NULL);
+         fail_if(!cell);
       r = eina_matrixsparse_cell_position_get(cell, &row, &col);
          fail_if(r == EINA_FALSE);
 

diff --git a/src/tests/eina_test_mempool.c b/src/tests/eina_test_mempool.c
index f911fff..a17d06d 100644 (file)
--- a/src/tests/eina_test_mempool.c
+++ b/src/tests/eina_test_mempool.c
@@ -68,9 +68,9 @@ _eina_mempool_test(Eina_Mempool *mp, Eina_Bool with_realloc, Eina_Bool with_gc)
         eina_mempool_free(mp, tbl[i]);
 
    if (with_realloc)
-      fail_if(eina_mempool_realloc(mp, tbl[500], 25) == NULL);
+      fail_if(!eina_mempool_realloc(mp, tbl[500], 25));
    else
-      fail_if(eina_mempool_realloc(mp, tbl[500], 25) != NULL);
+      fail_if(!!eina_mempool_realloc(mp, tbl[500], 25));
 
    if (with_gc)
      {

diff --git a/src/tests/eina_test_rbtree.c b/src/tests/eina_test_rbtree.c
index fabe2bf..cb8b85d 100644 (file)
--- a/src/tests/eina_test_rbtree.c
+++ b/src/tests/eina_test_rbtree.c
@@ -30,7 +30,7 @@
 static inline Eina_Bool
 _eina_rbtree_is_red(Eina_Rbtree *tree)
 {
-   return tree != NULL && tree->color == EINA_RBTREE_RED;
+   return !!tree && tree->color == EINA_RBTREE_RED;
 }
 
 static int
@@ -261,7 +261,7 @@ START_TEST(eina_rbtree_simple_remove)
    _eina_rbtree_black_height(root,
                              EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
 
-   fail_if(root == NULL);
+   fail_if(!root);
 
    i = 69;
    lookup = eina_rbtree_inline_lookup(root,
@@ -271,7 +271,7 @@ START_TEST(eina_rbtree_simple_remove)
                                          eina_rbtree_int_key),
                                       NULL);
    _eina_rbtree_black_height(root, EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
-   fail_if(lookup == NULL);
+   fail_if(!lookup);
 
    root =
       eina_rbtree_inline_remove(root, lookup, EINA_RBTREE_CMP_NODE_CB(
@@ -325,7 +325,7 @@ START_TEST(eina_rbtree_simple_remove2)
    _eina_rbtree_black_height(root,
                              EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
 
-   fail_if(root == NULL);
+   fail_if(!root);
 
    i = 69;
    lookup = eina_rbtree_inline_lookup(root,
@@ -335,7 +335,7 @@ START_TEST(eina_rbtree_simple_remove2)
                                          eina_rbtree_int_key),
                                       NULL);
    _eina_rbtree_black_height(root, EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
-   fail_if(lookup == NULL);
+   fail_if(!lookup);
 
    root =
       eina_rbtree_inline_remove(root, lookup, EINA_RBTREE_CMP_NODE_CB(
@@ -419,7 +419,7 @@ START_TEST(eina_rbtree_simple_remove3)
    _eina_rbtree_black_height(root,
                              EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
 
-   fail_if(root == NULL);
+   fail_if(!root);
 
    i = 1113497590;
    lookup = eina_rbtree_inline_lookup(root,
@@ -429,7 +429,7 @@ START_TEST(eina_rbtree_simple_remove3)
                                          eina_rbtree_int_key),
                                       NULL);
    _eina_rbtree_black_height(root, EINA_RBTREE_CMP_NODE_CB(eina_rbtree_int_cmp));
-   fail_if(lookup == NULL);
+   fail_if(!lookup);
 
    root =
       eina_rbtree_inline_remove(root, lookup, EINA_RBTREE_CMP_NODE_CB(

diff --git a/src/tests/eina_test_str.c b/src/tests/eina_test_str.c
index f0ea291..fc34fd9 100644 (file)
--- a/src/tests/eina_test_str.c
+++ b/src/tests/eina_test_str.c
@@ -91,25 +91,25 @@ START_TEST(str_split)
    eina_init();
 
    result = eina_str_split_full("nomatch", "", -1, &elements);
-        fail_if(result != NULL);
+        fail_if(!!result);
         fail_if(elements != 0);
 
    result = eina_str_split_full("nomatch", "x", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 1);
         fail_if(strcmp(result[0], "nomatch") != 0);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("nomatch", "xyz", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 1);
         fail_if(strcmp(result[0], "nomatch") != 0);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("match:match:match", ":", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 3);
    while (elements >= 1)
      {
@@ -120,7 +120,7 @@ START_TEST(str_split)
         free(result);
 
    result = eina_str_split_full("a:b:c", ":", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 3);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "b") != 0);
@@ -129,7 +129,7 @@ START_TEST(str_split)
         free(result);
 
    result = eina_str_split_full("a:b:", ":", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 3);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "b") != 0);
@@ -138,7 +138,7 @@ START_TEST(str_split)
         free(result);
 
    result = eina_str_split_full(":b:c", ":", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 3);
         fail_if(strcmp(result[0], "") != 0);
         fail_if(strcmp(result[1], "b") != 0);
@@ -147,7 +147,7 @@ START_TEST(str_split)
         free(result);
 
    result = eina_str_split_full(":", ":", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 2);
         fail_if(strcmp(result[0], "") != 0);
         fail_if(strcmp(result[1], "") != 0);
@@ -155,14 +155,14 @@ START_TEST(str_split)
         free(result);
 
    result = eina_str_split_full("a", "!!!!!!!!!", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 1);
         fail_if(strcmp(result[0], "a") != 0);
         free(result[0]);
         free(result);
 
    result = eina_str_split_full("aaba", "ab", -1, &elements);
-        fail_if(result == NULL);
+        fail_if(!result);
         fail_if(elements != 2);
         fail_if(strcmp(result[0], "a") != 0);
         fail_if(strcmp(result[1], "a") != 0);

diff --git a/src/tests/eina_test_strbuf.c b/src/tests/eina_test_strbuf.c
index 87dfc56..dc66dc5 100644 (file)
--- a/src/tests/eina_test_strbuf.c
+++ b/src/tests/eina_test_strbuf.c
@@ -350,7 +350,7 @@ START_TEST(strbuf_append_realloc)
         fail_if(eina_strbuf_length_get(buf) != (runs * target_pattern_size));
 
    str = eina_strbuf_string_get(buf);
-        fail_if(str == NULL);
+        fail_if(!str);
    for (i = 0; i < runs; i++, str += target_pattern_size)
         fail_if(memcmp(str, target_pattern, target_pattern_size));
 
@@ -385,7 +385,7 @@ START_TEST(strbuf_prepend_realloc)
         fail_if(eina_strbuf_length_get(buf) != (runs * target_pattern_size));
 
    str = eina_strbuf_string_get(buf);
-        fail_if(str == NULL);
+        fail_if(!str);
    for (i = 0; i < runs; i++, str += target_pattern_size)
         fail_if(memcmp(str, target_pattern, target_pattern_size));
 

diff --git a/src/tests/eina_test_stringshare.c b/src/tests/eina_test_stringshare.c
index 0d34aec..e578b16 100644 (file)
--- a/src/tests/eina_test_stringshare.c
+++ b/src/tests/eina_test_stringshare.c
@@ -82,8 +82,8 @@ START_TEST(eina_stringshare_small)
         t0 = eina_stringshare_add(buf);
         t1 = eina_stringshare_add(buf);
 
-        fail_if(t0 == NULL);
-        fail_if(t1 == NULL);
+        fail_if(!t0);
+        fail_if(!t1);
         fail_if(t0 != t1);
         fail_if(strcmp(t0, buf) != 0);
         fail_if((int)strlen(buf) != eina_stringshare_strlen(t0));
@@ -108,8 +108,8 @@ START_TEST(eina_stringshare_test_share)
    t0 = eina_stringshare_add(TEST0);
    t1 = eina_stringshare_add(TEST0);
 
-   fail_if(t0 == NULL);
-   fail_if(t1 == NULL);
+   fail_if(!t0);
+   fail_if(!t1);
    fail_if(strcmp(t0, TEST0) != 0);
    fail_if(strcmp(t1, TEST0) != 0);
    fail_if(t0 != t1);
@@ -162,7 +162,7 @@ START_TEST(eina_stringshare_collision)
         if (rand() > RAND_MAX / 2)
           {
              const char *r = eina_stringshare_add(buffer);
-             fail_if(r == NULL);
+             fail_if(!r);
           }
      }
 
@@ -173,9 +173,9 @@ START_TEST(eina_stringshare_collision)
         eina_convert_itoa(60000 - i, buffer);
         eina_array_push(ea, (void *)eina_stringshare_add(buffer));
         r = eina_stringshare_add(buffer);
-        fail_if(r == NULL);
+        fail_if(!r);
         r = eina_stringshare_add(buffer);
-        fail_if(r == NULL);
+        fail_if(!r);
      }
 
    for (i = 0; i < 200; ++i)

diff --git a/src/tests/eina_test_ustr.c b/src/tests/eina_test_ustr.c
index c4ccd95..992fd25 100644 (file)
--- a/src/tests/eina_test_ustr.c
+++ b/src/tests/eina_test_ustr.c
@@ -133,7 +133,7 @@ START_TEST(eina_unicode_strncpy_test)
 
    /* Hopefully won't segfault */
    rv = eina_unicode_strncpy(NULL, STR1, 0);
-   fail_if(rv != NULL);
+   fail_if(!!rv);
 
    eina_shutdown();
 }

diff --git a/src/tests/eina_test_ustringshare.c b/src/tests/eina_test_ustringshare.c
index 1d1f7b8..7cd37ce 100644 (file)
--- a/src/tests/eina_test_ustringshare.c
+++ b/src/tests/eina_test_ustringshare.c
@@ -71,8 +71,8 @@ START_TEST(eina_ustringshare_test_share)
    t0 = eina_ustringshare_add(TEST0);
    t1 = eina_ustringshare_add(TEST0);
 
-   fail_if(t0 == NULL);
-   fail_if(t1 == NULL);
+   fail_if(!t0);
+   fail_if(!t1);
    fail_if(eina_unicode_strcmp(t0, TEST0) != 0);
    fail_if(eina_unicode_strcmp(t1, TEST0) != 0);
    fail_if(t0 != t1);

diff --git a/src/tests/evas_list.c b/src/tests/evas_list.c
index d1ab651..00ee11d 100644 (file)
--- a/src/tests/evas_list.c
+++ b/src/tests/evas_list.c
@@ -1009,14 +1009,14 @@ evas_list_sort(Evas_List *list, int size, int (*func)(void *, void *))
                   Evas_List *prev1;
                   Evas_List *prev2;
 
-                  if (size1 == 0 || head1 == NULL) /* List1 is empty, head1 is already at the end of the list. So only need to update head2 */
+                  if (size1 == 0 || !head1) /* List1 is empty, head1 is already at the end of the list. So only need to update head2 */
                     {
                        for (; pass_number < size_sum; ++pass_number)
                           head2 = evas_list_next (head2);
                        break;
                     }
                   else
-                  if (size2 == 0 || head2 == NULL) /* List2 is empty, just leave */
+                  if (size2 == 0 || !head2) /* List2 is empty, just leave */
                      break;
                   else
                   if (func (head1->data, head2->data) < 0)