Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/lib
Modified Files:
eina_iterator.c
Log Message:
Use the new iterator API.
===================================================================
RCS file: /cvs/e/e17/proto/eina/src/lib/eina_iterator.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eina_iterator.c 11 Aug 2008 16:30:16 -0000 1.1
+++ eina_iterator.c 12 Aug 2008 08:40:36 -0000 1.2
@@ -33,24 +33,17 @@
}
EAPI void *
-eina_iterator_data_get(Eina_Iterator *iterator)
-{
- if (!iterator) return NULL;
- return iterator->get_content(iterator);
-}
-
-EAPI void *
eina_iterator_container_get(Eina_Iterator *iterator)
{
if (!iterator) return NULL;
return iterator->get_container(iterator);
}
-EAPI Eina_Error
-eina_iterator_next(Eina_Iterator *iterator)
+EAPI Eina_Bool
+eina_iterator_next(Eina_Iterator *iterator, void **data)
{
if (!iterator) return EINA_FALSE;
- return iterator->next(iterator);
+ return iterator->next(iterator, data);
}
EAPI void
@@ -64,9 +57,7 @@
if (!iterator) return ;
container = iterator->get_container(iterator);
- while ((data = iterator->get_content(iterator)) != NULL) {
+ while (iterator->next(iterator, &data) == EINA_TRUE) {
if (cb(container, data, (void*) fdata) != EINA_TRUE) return ;
- if (iterator->next(iterator) != EINA_TRUE)
- break ;
}
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
