[EGIT] [core/efl] master 06/08: ecore: use EINA_ERROR_PROMISE_CANCEL instead of a custom Ecore one.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0e6d5df60c7fb19baa2f4b2fc426dbb48de9a74a

commit 0e6d5df60c7fb19baa2f4b2fc426dbb48de9a74a
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Fri Jun 3 16:57:30 2016 -0700

    ecore: use EINA_ERROR_PROMISE_CANCEL instead of a custom Ecore one.
---
 src/lib/ecore/ecore.c         | 4 ----
 src/lib/ecore/ecore_main.c    | 2 +-
 src/lib/ecore/ecore_private.h | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 389355c..5a9e2d2 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -67,8 +67,6 @@ static int _ecore_init_count_threshold = 0;
 int _ecore_log_dom = -1;
 int _ecore_fps_debug = 0;
 
-Eina_Error _promise_canceled;
-
 typedef struct _Ecore_Safe_Call Ecore_Safe_Call;
 struct _Ecore_Safe_Call
 {
@@ -252,8 +250,6 @@ ecore_init(void)
    if (!ecore_mempool_init()) goto shutdown_mempool;
    _ecore_main_loop_init();
 
-   _promise_canceled = eina_error_msg_static_register("Promise has been 
canceled.");
-
    vpath = eo_add(EFL_VPATH_CORE_CLASS, NULL);
    if (vpath) efl_vpath_manager_register(EFL_VPATH_MANAGER_CLASS, 0, vpath);
 
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 01b7875..7520ce5 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -2863,7 +2863,7 @@ _efl_loop_args_add(Eo *obj, Efl_Loop_Data *pd 
EINA_UNUSED, int argc, const char
 static void
 _efl_loop_internal_cancel(Efl_Internal_Promise *p)
 {
-   eina_promise_owner_error_set(p->promise, _promise_canceled);
+   eina_promise_owner_error_set(p->promise, EINA_ERROR_PROMISE_CANCEL);
    free(p);
 }
 
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 37303f4..1b4b355 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -359,8 +359,6 @@ GENERIC_ALLOC_FREE_HEADER(Ecore_Win32_Handler, 
ecore_win32_handler);
 
 #undef GENERIC_ALLOC_FREE_HEADER
 
-extern Eina_Error _promise_canceled;
-
 extern Eo *_mainloop_singleton;
 extern Eo *_ecore_parent;
 #define ECORE_PARENT_CLASS ecore_parent_class_get()

--