cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=348c71e9ec16f1fca04261a1b8fd3da951a331ce
commit 348c71e9ec16f1fca04261a1b8fd3da951a331ce Author: Cedric Bail <[email protected]> Date: Thu Dec 14 16:42:23 2017 -0800 eio: update efl_io_manager_xattr_ls test to use Eina_Future. --- src/tests/eio/eio_test_manager_xattr.c | 38 +++++++--------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c index 261d2e2c8b..2f41b1bc6c 100644 --- a/src/tests/eio/eio_test_manager_xattr.c +++ b/src/tests/eio/eio_test_manager_xattr.c @@ -36,17 +36,16 @@ static const char *attr_data[] = int total_attributes = sizeof(attribute)/sizeof(attribute[0]); static void -_main_cb(void *data, const Efl_Event *ev) +_main_cb(void *data, Eina_Accessor *access) { - Efl_Future_Event_Progress *progress = ev->info; - const Eina_Array *attrs = progress->progress; const char* attr; int *num_of_attr = (int *)data; - unsigned int i, j; - Eina_Array_Iterator it; + unsigned int count; - EINA_ARRAY_ITER_NEXT(attrs, j, attr, it) + EINA_ACCESSOR_FOREACH(access, count, attr) { + unsigned int i; + for (i = 0; i < sizeof (attribute) / sizeof (attribute[0]); ++i) { if (strcmp(attr, attribute[i]) == 0) @@ -58,28 +57,6 @@ _main_cb(void *data, const Efl_Event *ev) } } -static void -_done_cb(void *data, const Efl_Event *ev EINA_UNUSED) - -{ - int *num_of_attr = (int *)data; - - fail_if(*num_of_attr != total_attributes); - - ecore_main_loop_quit(); -} - -static void -_error_cb(void *data EINA_UNUSED, const Efl_Event *ev) -{ - Efl_Future_Event_Failure *failure = ev->info; - - fprintf(stderr, "Something has gone wrong:%s\n", eina_error_msg_get(failure->error)); - abort(); - - ecore_main_loop_quit(); -} - static Eina_Value _future_done_cb(void *data EINA_UNUSED, const Eina_Value array, @@ -147,7 +124,6 @@ START_TEST(eio_test_job_xattr_set) int num_of_attr = 0, fd; unsigned int i; Eo *job; - Efl_Future *ls = NULL; Eina_Future **futures = NULL; ecore_init(); @@ -199,8 +175,8 @@ START_TEST(eio_test_job_xattr_set) num_of_attr = 0; - efl_future_use(&ls, efl_io_manager_xattr_ls(job, test_file_path)); - efl_future_then(ls, _done_cb, _error_cb, _main_cb, &num_of_attr); + eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL), + _future_done_cb, &num_of_attr); fail_if(num_of_attr != 0); --
