summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-26 13:34:45 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-26 13:35:07 -0300
commit1ed8759e1abd0d46a3835bea09a5926172a8aead (patch)
tree257e24a8cdceb9effc3ad8e5b5252a6976c6769c
parentb0b8109cd5dbe295f3024b98723336bbb89feda8 (diff)
downloadefl-1ed8759e1abd0d46a3835bea09a5926172a8aead.tar.gz
ecore: eldbus: Fix prototype for promise then_cb new prototype
Added Eina_Promise parameter and removed indirection for Eina_Error.
-rw-r--r--src/tests/ecore/ecore_test_job.c2
-rw-r--r--src/tests/ecore/ecore_test_timer.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c16
3 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/ecore/ecore_test_job.c b/src/tests/ecore/ecore_test_job.c
index 05158c9460..47257104f6 100644
--- a/src/tests/ecore/ecore_test_job.c
+++ b/src/tests/ecore/ecore_test_job.c
@@ -6,7 +6,7 @@
#include "ecore_suite.h"
static void
-_ecore_promise_quit(void *data, void *value)
+_ecore_promise_quit(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
{
Eina_Bool *bob = data;
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 35e900ecda..2e07b5347b 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -176,7 +176,7 @@ START_TEST(ecore_test_timers)
END_TEST
static void
-_ecore_promise_quit(void *data, void *value)
+_ecore_promise_quit(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
{
Eina_Bool *bob = data;
double *start = *(double**)value;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 361aead2a7..68398ca11f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -15,21 +15,21 @@
#include "eldbus_suite.h"
static void
-_promise_then_quit_cb(void **data , void **value )
+_promise_then_quit_cb(void **data , void **value, Eina_Promise* promise EINA_UNUSED)
{
*data = *value;
ecore_main_loop_quit();
}
static void
-_promise_then_quit_u_cb(unsigned *data , unsigned *value)
+_promise_then_quit_u_cb(unsigned *data , unsigned *value, Eina_Promise* promise EINA_UNUSED)
{
*data = *value;
ecore_main_loop_quit();
}
static void
-_promise_then_cp(Eina_Value *data , void *value)
+_promise_then_cp(Eina_Value *data , void *value, Eina_Promise* promise EINA_UNUSED)
{
eina_value_copy(value, data);
ecore_main_loop_quit();
@@ -37,28 +37,28 @@ _promise_then_cp(Eina_Value *data , void *value)
static void
-_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED)
+_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
{
ck_assert_msg(0, "Promise Expected Error:\n");
ecore_main_loop_quit();
}
static void
-_error_then_ok(void* data, Eina_Error const* error)
+_error_then_ok(void* data, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
{
Eina_Error const* expected_error = (Eina_Error*)data;
if (data != NULL)
{
- ck_assert_int_eq(*error, *expected_error);
+ ck_assert_int_eq(error, *expected_error);
}
ecore_main_loop_quit();
}
static void
-_error_then_cb(void* data EINA_UNUSED, Eina_Error const* error)
+_error_then_cb(void* data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
{
- ck_assert_msg(0,"Promise ERROR: %s\n", eina_error_msg_get(*error));
+ ck_assert_msg(0,"Promise ERROR: %s\n", eina_error_msg_get(error));
ecore_main_loop_quit();
}