forked from enlightenment/efl
eina: applied eina_array_count_get -> eina_array_count api change.
SVN revision: 67021
This commit is contained in:
parent
d6c052a65a
commit
37b1cde295
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 "));
|
||||
|
|
Loading…
Reference in New Issue