From: lucas Date: Thu, 26 Aug 2010 01:34:13 +0000 (+0000) Subject: Revert and re-apply badnull patch X-Git-Tag: 2.0_alpha~70^2~372 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92dfc2fc747da948826ddddacab1368f9545d20a;p=framework%2Fuifw%2Feina.git Revert and re-apply badnull patch Revert previous patch generated by badnull.cocci script, and apply the new one. The main difference is that assert and assert-like functions are not touched anymore. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@51650 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/include/eina_inline_trash.x b/src/include/eina_inline_trash.x index f3d4ff9..4a50611 100644 --- a/src/include/eina_inline_trash.x +++ b/src/include/eina_inline_trash.x @@ -81,7 +81,7 @@ eina_trash_pop(Eina_Trash **trash) tmp = *trash; - if (*trash != NULL) + if (*trash) *trash = (*trash)->next; return tmp; diff --git a/src/lib/eina_matrixsparse.c b/src/lib/eina_matrixsparse.c index ac26a6c..ce5e062 100644 --- a/src/lib/eina_matrixsparse.c +++ b/src/lib/eina_matrixsparse.c @@ -531,7 +531,7 @@ _eina_matrixsparse_row_idx_siblings_find(const Eina_Matrixsparse *m, if (r->row > row) break; - assert(!!r); + assert(r != NULL); *p_prev = r->prev; *p_next = r; } @@ -541,7 +541,7 @@ _eina_matrixsparse_row_idx_siblings_find(const Eina_Matrixsparse *m, if (r->row < row) break; - assert(!!r); + assert(r != NULL); *p_prev = r; *p_next = r->next; } @@ -564,7 +564,7 @@ _eina_matrixsparse_row_cell_idx_siblings_find(const Eina_Matrixsparse_Row *r, if (c->col > col) break; - assert(!!c); + assert(c != NULL); *p_prev = c->prev; *p_next = c; } @@ -574,7 +574,7 @@ _eina_matrixsparse_row_cell_idx_siblings_find(const Eina_Matrixsparse_Row *r, if (c->col < col) break; - assert(!!c); + assert(c != NULL); *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); - assert(!!next); + assert(prev != NULL); + assert(next != NULL); 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); - assert(!!next); + assert(prev != NULL); + assert(next != NULL); c->prev = prev; c->next = next; prev->next = c; diff --git a/src/tests/eina_test_binshare.c b/src/tests/eina_test_binshare.c index 8dab062..b6c4c79 100644 --- 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); - fail_if(!t1); + fail_if(t0 == NULL); + fail_if(t1 == NULL); 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); - fail_if(!t1); + fail_if(t0 == NULL); + fail_if(t1 == NULL); 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); + fail_if(r == NULL); } } @@ -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); + fail_if(r == NULL); r = eina_binshare_add_length(buffer, strlen(buffer)); - fail_if(!r); + fail_if(r == NULL); } for (i = 0; i < 200; ++i) diff --git a/src/tests/eina_test_hash.c b/src/tests/eina_test_hash.c index ac6ee76..aeeb655 100644 --- 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); + fail_if(hash == NULL); 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")); + fail_if(eina_hash_find(hash, "42") == NULL); 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); + fail_if(hash == NULL); 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); + fail_if(hash == NULL); 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); + fail_if(hash == NULL); 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 eef1965..6e08847 100644 --- 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); + fail_if(l1 == NULL); l2 = eina_list_append(NULL, &data[4]); l2 = eina_list_append(l2, &data[5]); - fail_if(!l2); + fail_if(l2 == NULL); l1 = eina_list_merge(l1, l2); - fail_if(!l1); + fail_if(l1 == NULL); fail_if(eina_list_count(l1) != 6); - for (i = 0, l2 = l1; ((l2) && (i < 6)); ++i, l2 = l2->next) + for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next) fail_if(l2->data != &data[i]); fail_if(i != 6); - fail_if(!!l2); + fail_if(l2 != NULL); eina_list_free(l1); l1 = eina_list_append(NULL, &data[0]); l1 = eina_list_append(l1, &data[1]); - fail_if(!l1); + fail_if(l1 == NULL); 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); + fail_if(l2 == NULL); l1 = eina_list_merge(l1, l2); - fail_if(!l1); + fail_if(l1 == NULL); fail_if(eina_list_count(l1) != 6); - for (i = 0, l2 = l1; ((l2) && (i < 6)); ++i, l2 = l2->next) + for (i = 0, l2 = l1; ((l2 != NULL) && (i < 6)); ++i, l2 = l2->next) fail_if(l2->data != &data[i]); fail_if(i != 6); - fail_if(!!l2); + fail_if(l2 != NULL); 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); + fail_if(l1 == NULL); fail_if(eina_list_count(l1) != 9); l1 = eina_list_sorted_merge(l1, l4, eina_int_cmp); - fail_if(!l1); + fail_if(l1 == NULL); fail_if(eina_list_count(l1) != 12); l1 = eina_list_sorted_merge(l1, l5, eina_int_cmp); - fail_if(!l1); + fail_if(l1 == NULL); 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); + fail_if(l1 == NULL); 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); + fail_if(l2 == NULL); 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); + fail_if(l2 == NULL); 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); + fail_if(l1 == NULL); 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 3f529a8..e07b1ee 100644 --- 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); + fail_if(matrix == NULL); /* 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); + fail_if(matrix == NULL); 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); + fail_if(it == NULL); EINA_ITERATOR_FOREACH(it, cell) { - fail_if(!cell); + fail_if(cell == NULL); r = eina_matrixsparse_cell_position_get(cell, &row, &col); fail_if(r == EINA_FALSE); test1 = eina_matrixsparse_cell_data_get(cell); - fail_if(!test1 || *test1 != data[row][col]); + fail_if(test1 == NULL || *test1 != data[row][col]); } eina_iterator_free(it); it = eina_matrixsparse_iterator_complete_new(matrix); - fail_if(!it); + fail_if(it == NULL); EINA_ITERATOR_FOREACH(it, cell) { - fail_if(!cell); + fail_if(cell == NULL); 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 a17d06d..f911fff 100644 --- 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)); + fail_if(eina_mempool_realloc(mp, tbl[500], 25) == NULL); else - fail_if(!!eina_mempool_realloc(mp, tbl[500], 25)); + fail_if(eina_mempool_realloc(mp, tbl[500], 25) != NULL); if (with_gc) { diff --git a/src/tests/eina_test_rbtree.c b/src/tests/eina_test_rbtree.c index cb8b85d..fabe2bf 100644 --- 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 && tree->color == EINA_RBTREE_RED; + return tree != NULL && 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); + fail_if(root == NULL); 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); + fail_if(lookup == NULL); 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); + fail_if(root == NULL); 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); + fail_if(lookup == NULL); 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); + fail_if(root == NULL); 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); + fail_if(lookup == NULL); 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 fc34fd9..f0ea291 100644 --- 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); + fail_if(result != NULL); fail_if(elements != 0); result = eina_str_split_full("nomatch", "x", -1, &elements); - fail_if(!result); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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); + fail_if(result == NULL); 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 dc66dc5..87dfc56 100644 --- 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); + fail_if(str == NULL); 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); + fail_if(str == NULL); 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 e578b16..0d34aec 100644 --- 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); - fail_if(!t1); + fail_if(t0 == NULL); + fail_if(t1 == NULL); 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); - fail_if(!t1); + fail_if(t0 == NULL); + fail_if(t1 == NULL); 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); + fail_if(r == NULL); } } @@ -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); + fail_if(r == NULL); r = eina_stringshare_add(buffer); - fail_if(!r); + fail_if(r == NULL); } for (i = 0; i < 200; ++i) diff --git a/src/tests/eina_test_ustr.c b/src/tests/eina_test_ustr.c index 992fd25..c4ccd95 100644 --- 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); + fail_if(rv != NULL); eina_shutdown(); } diff --git a/src/tests/eina_test_ustringshare.c b/src/tests/eina_test_ustringshare.c index 7cd37ce..1d1f7b8 100644 --- 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); - fail_if(!t1); + fail_if(t0 == NULL); + fail_if(t1 == NULL); fail_if(eina_unicode_strcmp(t0, TEST0) != 0); fail_if(eina_unicode_strcmp(t1, TEST0) != 0); fail_if(t0 != t1);