razzor/irclogbot
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix events

Browse Source
This commit is contained in:
Olaf Rempel 2007-07-14 15:40:03 +02:00
parent 92bed5d520
commit 3275afd34c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
event.c
View File

@ -221,7 +221,7 @@ int event_loop(void)
continue; continue;
} }
/* timeout not elapsed, exit search (since list is sorted) */ /* first timeout not elapsed, exit search (since list is sorted) */
if (cmp_timeval(&entry->nextrun, &now) == -1) if (cmp_timeval(&entry->nextrun, &now) == -1)
break; break;
@ -265,7 +265,6 @@ int event_loop(void)
FD_ZERO(readfds); FD_ZERO(readfds);
} }
FD_SET(entry->fd, readfds); FD_SET(entry->fd, readfds);
} }
if (entry->flags & FD_WRITE) { if (entry->flags & FD_WRITE) {
@ -285,17 +284,16 @@ int event_loop(void)
* after an error. * after an error.
*/ */
continue; continue;
}
} else { list_for_each_entry(entry, &event_fd_list, list) {
list_for_each_entry(entry, &event_fd_list, list) { if (((entry->flags & (FD_READ | EVENT_NEW)) == FD_READ) && FD_ISSET(entry->fd, readfds))
if (((entry->flags & (FD_READ | EVENT_NEW)) == FD_READ) && FD_ISSET(entry->fd, readfds)) if (entry->read_cb(entry->fd, entry->read_priv) != 0)
if (entry->read_cb(entry->fd, entry->read_priv) != 0) entry->flags |= EVENT_DELETE;
entry->flags |= EVENT_DELETE;
if (((entry->flags & (FD_WRITE | EVENT_NEW)) == FD_WRITE) && FD_ISSET(entry->fd, writefds)) if (((entry->flags & (FD_WRITE | EVENT_NEW)) == FD_WRITE) && FD_ISSET(entry->fd, writefds))
if (entry->write_cb(entry->fd, entry->write_priv) != 0) if (entry->write_cb(entry->fd, entry->write_priv) != 0)
entry->flags |= EVENT_DELETE; entry->flags |= EVENT_DELETE;
}
} }
} }
free(fdsets); free(fdsets);