From 2e6c354ac82f42582348cbcf9272f0c90d6c1cae Mon Sep 17 00:00:00 2001 From: discomfitor Date: Tue, 21 Sep 2010 02:06:41 +0000 Subject: [PATCH] ecore_main_fd_handler_active_get -> Eina_Bool git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@52528 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore/Ecore.h | 2 +- src/lib/ecore/ecore_main.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index 11385d2..7fb9226 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h @@ -394,7 +394,7 @@ extern "C" { EAPI void ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Prep_Cb func, const void *data); EAPI void *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler); EAPI int ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler); - EAPI int ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); + EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); EAPI void ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags); EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Ecore_Fd_Win32_Cb func, const void *data); diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 4193ed0..e17d7d4 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -746,24 +746,23 @@ ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler) * @param fd_handler The given FD handler. * @param flags The flags, @c ECORE_FD_READ, @c ECORE_FD_WRITE or * @c ECORE_FD_ERROR to query. - * @return @c 1 if any of the given flags are active. @c 0 otherwise. + * @return #EINA_TRUE if any of the given flags are active. #EINA_FALSE otherwise. * @ingroup Ecore_FD_Handler_Group */ -EAPI int +EAPI Eina_Bool ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags) { - int ret; + int ret = EINA_FALSE; if (!ECORE_MAGIC_CHECK(fd_handler, ECORE_MAGIC_FD_HANDLER)) { ECORE_MAGIC_FAIL(fd_handler, ECORE_MAGIC_FD_HANDLER, "ecore_main_fd_handler_active_get"); - return 0; + return EINA_FALSE; } - ret = 0; - if ((flags & ECORE_FD_READ) && (fd_handler->read_active)) ret = 1; - if ((flags & ECORE_FD_WRITE) && (fd_handler->write_active)) ret = 1; - if ((flags & ECORE_FD_ERROR) && (fd_handler->error_active)) ret = 1; + if ((flags & ECORE_FD_READ) && (fd_handler->read_active)) ret = EINA_TRUE; + if ((flags & ECORE_FD_WRITE) && (fd_handler->write_active)) ret = EINA_TRUE; + if ((flags & ECORE_FD_ERROR) && (fd_handler->error_active)) ret = EINA_TRUE; return ret; } -- 2.7.4