DBG("next_ready");
return;
}
- if (fdh->read_active || fdh->write_active || fdh->error_active || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->read_active || fdh->write_active || fdh->error_active)
{
DBG("added");
// make sure next_ready is non-null by pointing to ourselves
fdh->write_active = EINA_TRUE;
fdh->error_active = EINA_TRUE;
}
- /* We'll add this one anyway outside this function,
- don't want it twice */
- if (fdh->flags & ECORE_FD_ALWAYS)
- continue;
_ecore_try_add_to_call_list(obj, pd, fdh);
}
if (is_file)
pd->file_fd_handlers = eina_list_append
(pd->file_fd_handlers, fdh);
- if (fdh->flags & ECORE_FD_ALWAYS)
- pd->always_fd_handlers = eina_list_append
- (pd->always_fd_handlers, fdh);
pd->fd_handlers = (Ecore_Fd_Handler *)
eina_inlist_append(EINA_INLIST_GET(pd->fd_handlers),
EINA_INLIST_GET(fdh));
if (pd->file_fd_handlers)
pd->file_fd_handlers =
eina_list_free(pd->file_fd_handlers);
- if (pd->always_fd_handlers)
- pd->always_fd_handlers =
- eina_list_free(pd->always_fd_handlers);
if (pd->fd_handlers_to_delete)
pd->fd_handlers_to_delete =
eina_list_free(pd->fd_handlers_to_delete);
fd_set rfds, wfds, exfds;
Ecore_Fd_Handler *fdh;
Eina_List *l;
- int max_fd, ret, outval;
+ int max_fd, ret;
#ifndef _WIN32
int err_no;
#endif
{
if (!fdh->delete_me)
{
- if ((fdh->flags & ECORE_FD_READ) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_READ)
{
FD_SET(fdh->fd, &rfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
}
- if ((fdh->flags & ECORE_FD_WRITE) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_WRITE)
{
FD_SET(fdh->fd, &wfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
}
- if ((fdh->flags & ECORE_FD_ERROR) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_ERROR)
{
FD_SET(fdh->fd, &exfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
{
if (!fdh->delete_me)
{
- if ((fdh->flags & ECORE_FD_READ) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_READ)
{
FD_SET(fdh->fd, &rfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
}
- if ((fdh->flags & ECORE_FD_WRITE) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_WRITE)
{
FD_SET(fdh->fd, &wfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
}
- if ((fdh->flags & ECORE_FD_ERROR) || (fdh->flags & ECORE_FD_ALWAYS))
+ if (fdh->flags & ECORE_FD_ERROR)
{
FD_SET(fdh->fd, &exfds);
if (fdh->fd > max_fd) max_fd = fdh->fd;
if (ret < 0)
{
#ifndef _WIN32
- if (err_no == EINTR)
- {
- outval = -1;
- goto BAIL;
- }
+ if (err_no == EINTR) return -1;
else if (err_no == EBADF) _ecore_main_fd_handlers_bads_rem(obj, pd);
#endif
}
#ifdef _WIN32
_ecore_main_win32_handlers_cleanup(obj, pd);
#endif
- outval = 1;
- goto BAIL;
+ return 1;
}
- outval = 0;
-BAIL:
- EINA_LIST_FOREACH(pd->always_fd_handlers, l, fdh)
- _ecore_try_add_to_call_list(obj, pd, fdh);
-
- return outval;
+ return 0;
}
#endif
EINA_INLIST_GET(fdh));
if (fdh->file)
pd->file_fd_handlers = eina_list_remove(pd->file_fd_handlers, fdh);
- if (fdh->flags & ECORE_FD_ALWAYS)
- pd->always_fd_handlers = eina_list_remove(pd->always_fd_handlers, fdh);
ECORE_MAGIC_SET(fdh, ECORE_MAGIC_NONE);
ecore_fd_handler_mp_free(fdh);
pd->fd_handlers_to_delete = eina_list_remove_list
{
if ((fdh->read_active) ||
(fdh->write_active) ||
- (fdh->error_active) ||
- (fdh->flags & ECORE_FD_ALWAYS))
+ (fdh->error_active))
{
fdh->references++;
if (!_ecore_call_fd_cb(fdh->func, fdh->data, fdh))