Remove not very useful parameter to eina_promise_then callbacks.
}
static void
-_efl_loop_args_job_cb(void *data, void *value EINA_UNUSED,
- Eina_Promise *promise EINA_UNUSED)
+_efl_loop_args_job_cb(void *data, void *value EINA_UNUSED)
{
Efl_Loop_Args *args = data;
Eo *obj = eo_parent_get(args);
}
}
-static void _ecore_promise_thread_release_ref(void* data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+static void _ecore_promise_thread_release_ref(void* data, void* value EINA_UNUSED)
{
_Ecore_Thread_Promise_Owner* p = data;
p->ref_count -= p->then_count;
if (error)
{
if (callback->error_cb)
- (*callback->error_cb)(callback->data, promise->promise.error, &promise->promise.vtable);
+ (*callback->error_cb)(callback->data, promise->promise.error);
}
else if (callback->callback)
{
{
char* buffer = promise->value;
void** p = (void**)buffer;
- (*callback->callback)(callback->data, *p, &promise->promise.vtable);
+ (*callback->callback)(callback->data, *p);
}
else
- (*callback->callback)(callback->data, &promise->value[0], &promise->promise.vtable);
+ (*callback->callback)(callback->data, &promise->value[0]);
}
free(callback);
_eina_promise_unref(&promise->promise);
/*
* @brief Function callback type for when using eina_promise_then
*/
-typedef void(*Eina_Promise_Cb)(void* data, void* value, Eina_Promise* promise);
+typedef void(*Eina_Promise_Cb)(void* data, void* value);
/*
* @brief Function callback type for when using eina_promise_then
*/
-typedef void(*Eina_Promise_Error_Cb)(void* data, Eina_Error error, Eina_Promise* promise);
+typedef void(*Eina_Promise_Error_Cb)(void* data, Eina_Error error);
/*
* @brief Function callback type for progress information
static void
-_efl_promise_then_widget(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
+_efl_promise_then_widget(void* data, void* v)
{
Elm_View_Form_Widget *w = data;
Eina_Value *value = v;
}
static void
-_efl_promise_error_widget(void *data EINA_UNUSED, Eina_Error err EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_efl_promise_error_widget(void *data EINA_UNUSED, Eina_Error err EINA_UNUSED)
{
}
static void
-_efl_model_promise_then_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
+_efl_model_promise_then_cb(void* data, void* v)
{
Elm_View_Form_Promise *p = data;
Eina_Value *value = v;
}
static void
-_efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_efl_model_promise_error_cb(void* data, Eina_Error error EINA_UNUSED)
{
Elm_View_Form_Promise *p = data;
EINA_SAFETY_ON_NULL_RETURN(p);
}
static void
-_property_get_cb(void* data, void* v, Eina_Promise* promise EINA_UNUSED)
+_property_get_cb(void* data, void* v)
{
View_List_ValueItem *vitem = data;
Eina_Value *value = v;
}
static void
-_property_get_error_cb(void* data, Eina_Error err EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_property_get_error_cb(void* data, Eina_Error err EINA_UNUSED)
{
View_List_ValueItem *vitem = data;
eina_stringshare_del(vitem->part);
}
static void
-_efl_model_load_children_then(void * data, void* value, Eina_Promise* promise EINA_UNUSED)
+_efl_model_load_children_then(void * data, void* value)
{
View_List_ItemData *pdata = data;
Eina_Accessor *accessor = value;
eina_promise_owner_value_set(promise, NULL, NULL);
}
-void promise_callback(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+void promise_callback(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
eina_promise_owner_error_set(promise, EINA_ERROR_OUT_OF_MEMORY);
}
-void promise_error_callback(void* data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
+void promise_error_callback(void* data EINA_UNUSED, Eina_Error error)
{
ck_assert(error == EINA_ERROR_OUT_OF_MEMORY);
ecore_main_loop_quit();
}
END_TEST
-void promise_callback2(void* data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+void promise_callback2(void* data, void* value EINA_UNUSED)
{
if(++(*(int*)data) == 2)
ecore_main_loop_quit();
}
END_TEST
-/* void promised_block_thread(const void* data EINA_UNUSED, Eina_Promise_Owner* promise, Ecore_Thread* thread EINA_UNUSED) */
-/* { */
-/* struct timespec v = {.tv_sec = 1, .tv_nsec = 0}, rem; */
-/* if(nanosleep(&v, &rem) == -1 && errno == EINTR) */
-/* do */
-/* { */
-/* v = rem; */
-/* } */
-/* while(nanosleep(&v, &rem) == -1 && errno == EINTR); */
-
-/* int r = 10; */
-/* eina_promise_owner_value_set(promise, &r, NULL); */
-/* } */
-
static void
-_ecore_test_promise_normal_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_ecore_test_promise_normal_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
END_TEST
static void
-_ecore_test_promise_immediate_set_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_ecore_test_promise_immediate_set_lifetime_cb(void* data EINA_UNUSED, void* value EINA_UNUSED)
{
ecore_main_loop_quit();
}
eina_lock_release(&v->lock);
}
-static void _cancel_promise_callback(void* data EINA_UNUSED, Eina_Error value, Eina_Promise* promise EINA_UNUSED)
+static void _cancel_promise_callback(void* data EINA_UNUSED, Eina_Error value)
{
ck_assert(value == EINA_ERROR_PROMISE_CANCEL);
ecore_main_loop_quit();
END_TEST
static void
-_ecore_promise_quit(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
+_ecore_promise_quit(void *data, void *value)
{
Eina_Bool *bob = data;
double *start = value;
}
static void
-promise_then_count(void *data EINA_UNUSED, void *p, Eina_Promise* promise EINA_UNUSED)
+promise_then_count(void *data EINA_UNUSED, void *p)
{
int *total = p;
ck_assert_ptr_ne(total, NULL);
}
static void
-promise_then_accessor(void *data EINA_UNUSED, void* p, Eina_Promise* promise EINA_UNUSED)
+promise_then_accessor(void *data EINA_UNUSED, void* p)
{
Eina_Accessor **accessor = (Eina_Accessor**)p;
ck_assert_ptr_ne(accessor, NULL);
}
static void
-promise_then_value(void *user EINA_UNUSED, void *p, Eina_Promise* promise EINA_UNUSED)
+promise_then_value(void *user EINA_UNUSED, void *p)
{
Eina_Value* value = p;
ck_assert_ptr_ne(value, NULL);
}
static void
-error_promise_then(void* data EINA_UNUSED, Eina_Error error EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+error_promise_then(void* data EINA_UNUSED, Eina_Error error EINA_UNUSED)
{
ck_abort_msg(0, "Error Promise cb");
ecore_main_loop_quit();
}
static void
-_create_file(void *data EINA_UNUSED, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_create_file(void *data EINA_UNUSED, void* value EINA_UNUSED)
{
int fd;
if((fd = eina_file_mkstemp("prefixXXXXXX.ext", &temp_filename)) > 0)
static void
-_create_file_error(void *data EINA_UNUSED, Eina_Error value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_create_file_error(void *data EINA_UNUSED, Eina_Error value EINA_UNUSED)
{
ck_abort_msg(0, "Error Promise cb called in Create file");
ecore_main_loop_quit();
}
static void
-_main_direct_cb(void *data, const Eina_File_Direct_Info *info, Eina_Promise* promise EINA_UNUSED)
+_main_direct_cb(void *data, const Eina_File_Direct_Info *info)
{
int *number_of_listed_files = (int *)data;
}
static void
-_main_cb(void *data, const char *file, Eina_Promise* promise EINA_UNUSED)
+_main_cb(void *data, const char *file)
{
int *number_of_listed_files = (int *)data;
}
static void
-_done_cb(void *data, void* value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_done_cb(void *data, void* value EINA_UNUSED)
{
int *number_of_listed_files = (int *)data;
fail_if((*number_of_listed_files) != test_count);
}
static void
-_error_cb(void *data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
+_error_cb(void *data EINA_UNUSED, Eina_Error error)
{
const char *msg = eina_error_msg_get(error);
EINA_LOG_ERR("error: %s", msg);
}
static void
-_open_done_cb(void *data, void *file_value, Eina_Promise* promise EINA_UNUSED)
+_open_done_cb(void *data, void *file_value)
{
Eina_Bool *opened = (Eina_Bool *)data;
*opened = EINA_TRUE;
}
static void
-_stat_done_cb(void *data, void *value, Eina_Promise* promise EINA_UNUSED)
+_stat_done_cb(void *data, void *value)
{
Eina_Stat const* stat = value;
Eina_Bool *is_dir = data;
tcase_add_test(tc, eio_job_test_file_direct_stat);
tcase_add_test(tc, eio_job_test_open);
}
-;
+
#include "eldbus_suite.h"
static void
-_promise_then_quit_cb(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
+_promise_then_quit_cb(void *data , void *value)
{
*(void**)data = value;
ecore_main_loop_quit();
}
static void
-_promise_then_quit_u_cb(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
+_promise_then_quit_u_cb(void *data , void *value)
{
unsigned *lhs = data;
unsigned *rhs = value;
}
static void
-_promise_then_cp(void *data , void *value, Eina_Promise* promise EINA_UNUSED)
+_promise_then_cp(void *data , void *value)
{
eina_value_copy(value, data);
ecore_main_loop_quit();
static void
-_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED, Eina_Promise* promise EINA_UNUSED)
+_promise_check_err(void *data EINA_UNUSED, void *value EINA_UNUSED)
{
ck_assert_msg(0, "Promise Expected Error:\n");
ecore_main_loop_quit();
}
static void
-_error_then_ok(void* data, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
+_error_then_ok(void* data, Eina_Error error)
{
Eina_Error const* expected_error = (Eina_Error*)data;
if (data != NULL)
}
static void
-_error_then_cb(void* data EINA_UNUSED, Eina_Error error, Eina_Promise* promise EINA_UNUSED)
+_error_then_cb(void* data EINA_UNUSED, Eina_Error error)
{
ck_assert_msg(0,"Promise ERROR: %s\n", eina_error_msg_get(error));
ecore_main_loop_quit();