From 37b1cde295b612dbb31ceee501afcee9f1103c31 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Tue, 10 Jan 2012 15:34:48 +0000 Subject: [PATCH] eina: applied eina_array_count_get -> eina_array_count api change. SVN revision: 67021 --- legacy/eina/src/examples/eina_array_01.c | 4 ++-- legacy/eina/src/include/eina_array.h | 2 +- legacy/eina/src/lib/eina_rbtree.c | 10 +++++----- legacy/eina/src/tests/eina_test_array.c | 6 +++--- legacy/eina/src/tests/eina_test_file.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/legacy/eina/src/examples/eina_array_01.c b/legacy/eina/src/examples/eina_array_01.c index 25e0944508..d93eb358e4 100644 --- a/legacy/eina/src/examples/eina_array_01.c +++ b/legacy/eina/src/examples/eina_array_01.c @@ -35,12 +35,12 @@ main(int argc, char **argv) for (i = 0; i < 20; i++) eina_array_push(array, strdup(strings[i])); - printf("array count: %d\n", eina_array_count_get(array)); + printf("array count: %d\n", eina_array_count(array)); eina_array_foreach(array, _print, NULL); printf("Top gun: %s\n", (char*)eina_array_data_get(array, 2)); - while (eina_array_count_get(array)) + while (eina_array_count(array)) free(eina_array_pop(array)); eina_array_free(array); diff --git a/legacy/eina/src/include/eina_array.h b/legacy/eina/src/include/eina_array.h index 007b75a1bb..d102a6b9be 100644 --- a/legacy/eina/src/include/eina_array.h +++ b/legacy/eina/src/include/eina_array.h @@ -169,7 +169,7 @@ * element, use eina_array_push() and to remove the last element, use * eina_array_pop(). To retrieve the element at a given position, use * eina_array_data_get(). The number of elements can be retrieved with - * eina_array_count_get(). + * eina_array_count(). * * Eina_Array is different from a conventional C array in a number of ways, most * importantly they grow and shrink dynamically, this means that if you add an diff --git a/legacy/eina/src/lib/eina_rbtree.c b/legacy/eina/src/lib/eina_rbtree.c index c0c9f9eaaa..5f1232c081 100644 --- a/legacy/eina/src/lib/eina_rbtree.c +++ b/legacy/eina/src/lib/eina_rbtree.c @@ -83,7 +83,7 @@ _eina_rbtree_iterator_list_new(const Eina_Rbtree *tree) static Eina_Rbtree * _eina_rbtree_iterator_get_content(Eina_Iterator_Rbtree *it) { - if (eina_array_count_get(it->stack) <= 0) + if (eina_array_count(it->stack) <= 0) return NULL; return eina_array_data_get(it->stack, 0); @@ -110,10 +110,10 @@ _eina_rbtree_iterator_next(Eina_Iterator_Rbtree *it, void **data) Eina_Iterator_Rbtree_List *new; Eina_Rbtree *tree; - if (eina_array_count_get(it->stack) <= 0) + if (eina_array_count(it->stack) <= 0) return EINA_FALSE; - last = eina_array_data_get(it->stack, eina_array_count_get(it->stack) - 1); + last = eina_array_data_get(it->stack, eina_array_count(it->stack) - 1); tree = last->tree; if (!last->tree || last->up == EINA_TRUE) @@ -128,10 +128,10 @@ _eina_rbtree_iterator_next(Eina_Iterator_Rbtree *it, void **data) { free(last); - if (eina_array_count_get(it->stack) > 0) + if (eina_array_count(it->stack) > 0) { last = eina_array_data_get(it->stack, - eina_array_count_get( + eina_array_count( it-> stack) - 1); diff --git a/legacy/eina/src/tests/eina_test_array.c b/legacy/eina/src/tests/eina_test_array.c index 0b054eaf38..1929601834 100644 --- a/legacy/eina/src/tests/eina_test_array.c +++ b/legacy/eina/src/tests/eina_test_array.c @@ -151,7 +151,7 @@ START_TEST(eina_array_remove_stuff) } fail_if(eina_array_remove(ea, keep_int, NULL) != EINA_TRUE); - fail_if(eina_array_count_get(ea) != 990); + fail_if(eina_array_count(ea) != 990); EINA_ARRAY_ITER_NEXT(ea, i, tmp, it) fail_if(*tmp == 0); @@ -165,7 +165,7 @@ START_TEST(eina_array_remove_stuff) eina_array_remove(ea, keep_int, NULL); // Remove all items - fail_if(eina_array_count_get(ea) != 980); + fail_if(eina_array_count(ea) != 980); EINA_ARRAY_ITER_NEXT(ea, i, tmp, it) { fail_if(*tmp == 0); @@ -174,7 +174,7 @@ START_TEST(eina_array_remove_stuff) eina_array_remove(ea, keep_int, NULL); - fail_if(eina_array_count_get(ea) != 0); + fail_if(eina_array_count(ea) != 0); eina_array_free(ea); diff --git a/legacy/eina/src/tests/eina_test_file.c b/legacy/eina/src/tests/eina_test_file.c index aeb54619bc..55e9976076 100644 --- a/legacy/eina/src/tests/eina_test_file.c +++ b/legacy/eina/src/tests/eina_test_file.c @@ -48,7 +48,7 @@ START_TEST(eina_file_split_simple) #endif fail_if(!ea); - fail_if(eina_array_count_get(ea) != 5); + fail_if(eina_array_count(ea) != 5); fail_if(strcmp(eina_array_data_get(ea, 0), "this")); fail_if(strcmp(eina_array_data_get(ea, 1), "is")); fail_if(strcmp(eina_array_data_get(ea, 2), "a")); @@ -66,7 +66,7 @@ START_TEST(eina_file_split_simple) #endif fail_if(!ea); - fail_if(eina_array_count_get(ea) != 6); + fail_if(eina_array_count(ea) != 6); fail_if(strcmp(eina_array_data_get(ea, 0), "this")); fail_if(strcmp(eina_array_data_get(ea, 1), "is")); fail_if(strcmp(eina_array_data_get(ea, 2), "a "));