hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove shadow variables 

SVN revision: 58945
This commit is contained in:
Vincent Torri 2011-04-27 05:45:28 +00:00
parent a3e8da3507
commit 544295504b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/ecore/src/lib/ecore_con/ecore_con_ares.c
View File

@ -68,8 +68,8 @@ static Eina_Bool _ecore_con_info_cares_timeout_cb(void *data);
static void static void
_ecore_con_info_cares_state_cb(void *data, _ecore_con_info_cares_state_cb(void *data,
ares_socket_t fd, ares_socket_t fd,
int read, int readable,
int write); int writable);
static int static int
_ecore_con_info_fds_search(const Ecore_Con_FD *fd1, _ecore_con_info_fds_search(const Ecore_Con_FD *fd1,
const Ecore_Con_FD *fd2); const Ecore_Con_FD *fd2);
@ -328,16 +328,16 @@ static Eina_Bool
_ecore_con_info_cares_fd_cb(Ecore_Con_FD *ecf, _ecore_con_info_cares_fd_cb(Ecore_Con_FD *ecf,
Ecore_Fd_Handler *fd_handler) 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)) 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)) 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; return ECORE_CALLBACK_RENEW;
} }
@ -352,8 +352,8 @@ _ecore_con_info_fds_search(const Ecore_Con_FD *fd1,
static void static void
_ecore_con_info_cares_state_cb(void *data __UNUSED__, _ecore_con_info_cares_state_cb(void *data __UNUSED__,
ares_socket_t fd, ares_socket_t fd,
int read, int readable,
int write) int writable)
{ {
int flags = 0; int flags = 0;
Ecore_Con_FD *search = NULL, *ecf = NULL; 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, search = eina_list_search_unsorted(info_fds,
(Eina_Compare_Cb)_ecore_con_info_fds_search, &ecf); (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); ares_process_fd(info_channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
if (search) if (search)
@ -387,8 +387,8 @@ _ecore_con_info_cares_state_cb(void *data __UNUSED__,
info_fds = eina_list_append(info_fds, search); info_fds = eina_list_append(info_fds, search);
} }
if (read) flags |= ECORE_FD_READ; if (readable) flags |= ECORE_FD_READ;
if (write) flags |= ECORE_FD_WRITE; if (writable) flags |= ECORE_FD_WRITE;
ecore_main_fd_handler_active_set(search->handler, flags); ecore_main_fd_handler_active_set(search->handler, flags);
} }