From 25324500e43b5021fda318fa73fc2df1bba1c0fa Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Tue, 30 Jul 2019 15:36:32 +0200 Subject: [PATCH] Fix typo in Efl prefix This annoyed me far far far more than it should. --- src/lib/ecore/efl_appthread.c | 8 ++++---- src/lib/ecore/efl_thread.c | 20 ++++++++++---------- src/lib/ecore/efl_threadio.c | 4 ++-- src/lib/ecore/efl_threadio.eo | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/ecore/efl_appthread.c b/src/lib/ecore/efl_appthread.c index c02fd11903..90a900ebff 100644 --- a/src/lib/ecore/efl_appthread.c +++ b/src/lib/ecore/efl_appthread.c @@ -240,18 +240,18 @@ _efl_appthread_efl_io_writer_can_write_get(const Eo *obj EINA_UNUSED, Efl_Appthr return pd->fd.can_write; } -void _appthread_threadio_call(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_free_cb); +void _appthread_threadio_call(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EflThreadIOCall func, Eina_Free_Cb func_free_cb); EOLIAN static void -_efl_appthread_efl_threadio_call(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_free_cb) +_efl_appthread_efl_threadio_call(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EflThreadIOCall func, Eina_Free_Cb func_free_cb) { _appthread_threadio_call(obj, pd, func_data, func, func_free_cb); } -void *_appthread_threadio_call_sync(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EFlThreadIOCallSync func, Eina_Free_Cb func_free_cb); +void *_appthread_threadio_call_sync(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EflThreadIOCallSync func, Eina_Free_Cb func_free_cb); EOLIAN static void * -_efl_appthread_efl_threadio_call_sync(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EFlThreadIOCallSync func, Eina_Free_Cb func_free_cb) +_efl_appthread_efl_threadio_call_sync(Eo *obj, Efl_Appthread_Data *pd, void *func_data, EflThreadIOCallSync func, Eina_Free_Cb func_free_cb) { return _appthread_threadio_call_sync(obj, pd, func_data, func, func_free_cb); } diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c index 7ae263c902..4a9ba48688 100644 --- a/src/lib/ecore/efl_thread.c +++ b/src/lib/ecore/efl_thread.c @@ -115,7 +115,7 @@ _cb_thread_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED) } else if (cmd.d.command == CMD_CALL) { - EFlThreadIOCall func = cmd.d.ptr[0]; + EflThreadIOCall func = cmd.d.ptr[0]; void *data = cmd.d.ptr[1]; Eina_Free_Cb free_func = cmd.d.ptr[2]; if (func) @@ -128,7 +128,7 @@ _cb_thread_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED) } else if (cmd.d.command == CMD_CALL_SYNC) { - EFlThreadIOCallSync func = cmd.d.ptr[0]; + EflThreadIOCallSync func = cmd.d.ptr[0]; void *data = cmd.d.ptr[1]; Eina_Free_Cb free_func = cmd.d.ptr[2]; Control_Reply *rep = cmd.d.ptr[3]; @@ -416,7 +416,7 @@ _cb_thread_parent_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED) } else if (cmd.d.command == CMD_CALL) { - EFlThreadIOCall func = cmd.d.ptr[0]; + EflThreadIOCall func = cmd.d.ptr[0]; void *data = cmd.d.ptr[1]; Eina_Free_Cb free_func = cmd.d.ptr[2]; if (func) @@ -429,7 +429,7 @@ _cb_thread_parent_ctrl_out(void *data, const Efl_Event *event EINA_UNUSED) } else if (cmd.d.command == CMD_CALL_SYNC) { - EFlThreadIOCallSync func = cmd.d.ptr[0]; + EflThreadIOCallSync func = cmd.d.ptr[0]; void *data = cmd.d.ptr[1]; Eina_Free_Cb free_func = cmd.d.ptr[2]; Control_Reply *rep = cmd.d.ptr[3]; @@ -1034,7 +1034,7 @@ _efl_thread_efl_io_writer_can_write_get(const Eo *obj EINA_UNUSED, Efl_Thread_Da } static void -_threadio_call(int fd, void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_free_cb) +_threadio_call(int fd, void *func_data, EflThreadIOCall func, Eina_Free_Cb func_free_cb) { Control_Data cmd; @@ -1048,7 +1048,7 @@ _threadio_call(int fd, void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_ void _appthread_threadio_call(Eo *obj EINA_UNUSED, Efl_Appthread_Data *pd, - void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_free_cb) + void *func_data, EflThreadIOCall func, Eina_Free_Cb func_free_cb) { Thread_Data *thdat = pd->thdat; _threadio_call(thdat->ctrl.in, func_data, func, func_free_cb); @@ -1056,13 +1056,13 @@ _appthread_threadio_call(Eo *obj EINA_UNUSED, Efl_Appthread_Data *pd, EOLIAN static void _efl_thread_efl_threadio_call(Eo *obj EINA_UNUSED, Efl_Thread_Data *pd, - void *func_data, EFlThreadIOCall func, Eina_Free_Cb func_free_cb) + void *func_data, EflThreadIOCall func, Eina_Free_Cb func_free_cb) { _threadio_call(pd->ctrl.in, func_data, func, func_free_cb); } static void * -_threadio_call_sync(int fd, void *func_data, EFlThreadIOCallSync func, Eina_Free_Cb func_free_cb) +_threadio_call_sync(int fd, void *func_data, EflThreadIOCallSync func, Eina_Free_Cb func_free_cb) { Control_Data cmd; Control_Reply rep; @@ -1082,7 +1082,7 @@ _threadio_call_sync(int fd, void *func_data, EFlThreadIOCallSync func, Eina_Free void * _appthread_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_Appthread_Data *pd, - void *func_data, EFlThreadIOCallSync func, Eina_Free_Cb func_free_cb) + void *func_data, EflThreadIOCallSync func, Eina_Free_Cb func_free_cb) { Thread_Data *thdat = pd->thdat; return _threadio_call_sync(thdat->ctrl.in, func_data, func, func_free_cb); @@ -1090,7 +1090,7 @@ _appthread_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_Appthread_Data *pd, EOLIAN static void * _efl_thread_efl_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_Thread_Data *pd, - void *func_data, EFlThreadIOCallSync func, Eina_Free_Cb func_free_cb) + void *func_data, EflThreadIOCallSync func, Eina_Free_Cb func_free_cb) { return _threadio_call_sync(pd->ctrl.in, func_data, func, func_free_cb); } diff --git a/src/lib/ecore/efl_threadio.c b/src/lib/ecore/efl_threadio.c index 9e21f40847..96a2c4fa26 100644 --- a/src/lib/ecore/efl_threadio.c +++ b/src/lib/ecore/efl_threadio.c @@ -44,12 +44,12 @@ _efl_threadio_outdata_get(const Eo *obj EINA_UNUSED, Efl_ThreadIO_Data *pd) } EOLIAN static void -_efl_threadio_call(Eo *obj EINA_UNUSED, Efl_ThreadIO_Data *pd EINA_UNUSED, void *func_data EINA_UNUSED, EFlThreadIOCall func EINA_UNUSED, Eina_Free_Cb func_free_cb EINA_UNUSED) +_efl_threadio_call(Eo *obj EINA_UNUSED, Efl_ThreadIO_Data *pd EINA_UNUSED, void *func_data EINA_UNUSED, EflThreadIOCall func EINA_UNUSED, Eina_Free_Cb func_free_cb EINA_UNUSED) { } EOLIAN static void * -_efl_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_ThreadIO_Data *pd EINA_UNUSED, void *func_data EINA_UNUSED, EFlThreadIOCallSync func EINA_UNUSED, Eina_Free_Cb func_free_cb EINA_UNUSED) +_efl_threadio_call_sync(Eo *obj EINA_UNUSED, Efl_ThreadIO_Data *pd EINA_UNUSED, void *func_data EINA_UNUSED, EflThreadIOCallSync func EINA_UNUSED, Eina_Free_Cb func_free_cb EINA_UNUSED) { return NULL; } diff --git a/src/lib/ecore/efl_threadio.eo b/src/lib/ecore/efl_threadio.eo index 14f6507c24..1bafb92a43 100644 --- a/src/lib/ecore/efl_threadio.eo +++ b/src/lib/ecore/efl_threadio.eo @@ -1,13 +1,13 @@ import efl_object; -function @beta EFlThreadIOCall { +function @beta EflThreadIOCall { [[ A Function to call on the "other end" of a thread obvject ]] params { @in event: const(event); [[ ]] } }; -function @beta EFlThreadIOCallSync { +function @beta EflThreadIOCallSync { [[ A Function to call on the "other end" of a thread obvject ]] params { @in event: const(event); [[ ]] @@ -35,12 +35,12 @@ mixin @beta Efl.ThreadIO } call { params { - func: EFlThreadIOCall; [[ ]] + func: EflThreadIOCall; [[ ]] } } call_sync { params { - func: EFlThreadIOCallSync; [[ ]] + func: EflThreadIOCallSync; [[ ]] } return: void_ptr; [[ ]] }