From 4c7513fb17fa4897ade69796e90393371be06968 Mon Sep 17 00:00:00 2001 From: caro Date: Wed, 27 Apr 2011 05:45:28 +0000 Subject: [PATCH] remove shadow variables git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@58945 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_con/ecore_con_ares.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_ares.c b/src/lib/ecore_con/ecore_con_ares.c index 1335e39..f66ac09 100644 --- a/src/lib/ecore_con/ecore_con_ares.c +++ b/src/lib/ecore_con/ecore_con_ares.c @@ -68,8 +68,8 @@ static Eina_Bool _ecore_con_info_cares_timeout_cb(void *data); static void _ecore_con_info_cares_state_cb(void *data, ares_socket_t fd, - int read, - int write); + int readable, + int writable); static int _ecore_con_info_fds_search(const Ecore_Con_FD *fd1, const Ecore_Con_FD *fd2); @@ -328,16 +328,16 @@ static Eina_Bool _ecore_con_info_cares_fd_cb(Ecore_Con_FD *ecf, Ecore_Fd_Handler *fd_handler) { - int read, write; + ares_socket_t read_fd, write_fd; - read = write = ARES_SOCKET_BAD; + read_fd = write_fd = ARES_SOCKET_BAD; if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) - read = ecf->fd; + read_fd = ecf->fd; if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) - write = ecf->fd; + write_fd = ecf->fd; - ares_process_fd(info_channel, read, write); + ares_process_fd(info_channel, read_fd, write_fd); return ECORE_CALLBACK_RENEW; } @@ -352,8 +352,8 @@ _ecore_con_info_fds_search(const Ecore_Con_FD *fd1, static void _ecore_con_info_cares_state_cb(void *data __UNUSED__, ares_socket_t fd, - int read, - int write) + int readable, + int writable) { int flags = 0; Ecore_Con_FD *search = NULL, *ecf = NULL; @@ -361,7 +361,7 @@ _ecore_con_info_cares_state_cb(void *data __UNUSED__, search = eina_list_search_unsorted(info_fds, (Eina_Compare_Cb)_ecore_con_info_fds_search, &ecf); - if (!(read | write)) + if (!(readable | writable)) { ares_process_fd(info_channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD); if (search) @@ -387,8 +387,8 @@ _ecore_con_info_cares_state_cb(void *data __UNUSED__, info_fds = eina_list_append(info_fds, search); } - if (read) flags |= ECORE_FD_READ; - if (write) flags |= ECORE_FD_WRITE; + if (readable) flags |= ECORE_FD_READ; + if (writable) flags |= ECORE_FD_WRITE; ecore_main_fd_handler_active_set(search->handler, flags); } -- 2.7.4