diff options
author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-06-03 20:03:13 -0300 |
---|---|---|
committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-06-03 20:03:13 -0300 |
commit | f6a260e7a9ff550483d0a081cf4ce90cc4e2bfc8 (patch) | |
tree | 6db17e0cf5e61d376b55a8ff8189a848cd2170e8 | |
parent | cd91b02dd1f04daaed19b51c7fda2d4047b4ad78 (diff) | |
download | efl-f6a260e7a9ff550483d0a081cf4ce90cc4e2bfc8.tar.gz |
eina: Remove Eina_Promise* parameter to callbacks to promises in examples
-rw-r--r-- | src/examples/eio/eio_job_ls.c | 1 | ||||
-rw-r--r-- | src/examples/eio/eio_job_open.c | 6 | ||||
-rw-r--r-- | src/examples/eio/eio_job_open_multi.c | 1 | ||||
-rw-r--r-- | src/examples/eldbus/dbusmodel.c | 20 | ||||
-rw-r--r-- | src/examples/elementary/filemvc.c | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/examples/eio/eio_job_ls.c b/src/examples/eio/eio_job_ls.c index 2e2db1faf6..9426c23a74 100644 --- a/src/examples/eio/eio_job_ls.c +++ b/src/examples/eio/eio_job_ls.c @@ -21,7 +21,6 @@ void done_cb(void *data, void *value EINA_UNUSED) void error_cb(void *data, Eina_Error error) { Eio_Job *job = data; - EINA_SAFETY_ON_NULL_RETURN(error); const char *msg = eina_error_msg_get(error); printf("%s error: %s\n", __FUNCTION__, msg); ecore_main_loop_quit(); diff --git a/src/examples/eio/eio_job_open.c b/src/examples/eio/eio_job_open.c index 7662bfb8e7..997724377b 100644 --- a/src/examples/eio/eio_job_open.c +++ b/src/examples/eio/eio_job_open.c @@ -9,7 +9,7 @@ #include <Eio.h> #include <Ecore.h> -void error_cb(void *data, Eina_Error error, Eina_Promise* promise EINA_UNUSED) +void error_cb(void *data, Eina_Error error) { EINA_SAFETY_ON_NULL_RETURN(data); @@ -19,7 +19,7 @@ void error_cb(void *data, Eina_Error error, Eina_Promise* promise EINA_UNUSED) ecore_main_loop_quit(); } -void done_closing_cb(void* data EINA_UNUSED, void *value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED) +void done_closing_cb(void* data EINA_UNUSED, void *value EINA_UNUSED) { printf("%s closed file.\n", __FUNCTION__); @@ -34,7 +34,7 @@ void closing_job(Eio_Job *job, Eina_File *file) eina_promise_then(promise, &done_closing_cb, &error_cb, job); } -void done_open_cb(void *data, void* value, Eina_Promise* promise) +void done_open_cb(void *data, void* value) { EINA_SAFETY_ON_NULL_RETURN(data); EINA_SAFETY_ON_NULL_RETURN(value); diff --git a/src/examples/eio/eio_job_open_multi.c b/src/examples/eio/eio_job_open_multi.c index d1f8fa97bd..c621ade5cf 100644 --- a/src/examples/eio/eio_job_open_multi.c +++ b/src/examples/eio/eio_job_open_multi.c @@ -11,7 +11,6 @@ void error_cb(void *data, Eina_Error error) { - EINA_SAFETY_ON_NULL_RETURN(error); EINA_SAFETY_ON_NULL_RETURN(data); const char *msg = eina_error_msg_get(error); diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c index 4cc7178176..9695bd5468 100644 --- a/src/examples/eldbus/dbusmodel.c +++ b/src/examples/eldbus/dbusmodel.c @@ -16,8 +16,9 @@ static int prop_count = 0; static void -promise_then_prop_c(Eo* obj, void* data) +promise_then_prop_c(void* priv_obj, void* data) { + Eo* obj = priv_obj; Eina_Value * property_value; const Eina_Array *properties_list; Eina_Array_Iterator a_it; @@ -46,14 +47,14 @@ promise_then_prop_c(Eo* obj, void* data) } static void -error_cb(void* data EINA_UNUSED, const Eina_Error *error EINA_UNUSED) +error_cb(void* data EINA_UNUSED, Eina_Error error EINA_UNUSED) { printf(" ERROR\n"); ecore_main_loop_quit(); } static void -promise_then_a(Eo* obj EINA_UNUSED, void* data) +promise_then_a(void* priv_obj EINA_UNUSED, void* data) { const Eina_Array *properties_list; Eina_Array_Iterator a_it; @@ -95,7 +96,7 @@ promise_then_a(Eo* obj EINA_UNUSED, void* data) ecore_main_loop_quit(); } static void -promise_then(Eo* obj EINA_UNUSED, void* data) +promise_then(void* obj EINA_UNUSED, void* data) { Eina_Accessor *accessor; unsigned int* count; @@ -109,12 +110,13 @@ promise_then(Eo* obj EINA_UNUSED, void* data) return; } - eina_iterator_next(iterator, (void **)&count); - - printf("efl_model_loaded count %d\n", (int)*count); fflush(stdout); - printf("efl_model_loaded accessor %p\n", accessor); fflush(stdout); + if(eina_iterator_next(iterator, (void **)&count)) + { + printf("efl_model_loaded count %d\n", (int)*count); fflush(stdout); + printf("efl_model_loaded accessor %p\n", accessor); fflush(stdout); - promise_then_a(NULL, accessor); + promise_then_a(NULL, accessor); + } } int diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c index 1f05feb238..75fe6526ef 100644 --- a/src/examples/elementary/filemvc.c +++ b/src/examples/elementary/filemvc.c @@ -71,7 +71,7 @@ _promise_then(void *data, void *value) } static void -_promise_error(void *data, const Eina_Error *err) +_promise_error(void *data, const Eina_Error err) { } |