X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/2489c1a05bd92271c61c3db3a6fb5f63a168b528..7e305734bf37cb00b5be4f32a80bccdf83c768b8:/ev_poll.c?ds=sidebyside diff --git a/ev_poll.c b/ev_poll.c index 5ad7261..726a45b 100644 --- a/ev_poll.c +++ b/ev_poll.c @@ -53,7 +53,7 @@ poll_modify (EV_P_ int fd, int oev, int nev) if (idx < 0) /* need to allocate a new pollfd */ { pollidxs [fd] = idx = pollcnt++; - array_needsize (struct pollfd, polls, pollmax, pollcnt, ); + array_needsize (struct pollfd, polls, pollmax, pollcnt, (void)); polls [idx].fd = fd; } @@ -79,7 +79,7 @@ static void poll_poll (EV_P_ ev_tstamp timeout) { int i; - int res = poll (polls, pollcnt, ceil (timeout * 1000.)); + int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.)); if (res < 0) { @@ -94,12 +94,15 @@ poll_poll (EV_P_ ev_tstamp timeout) } for (i = 0; i < pollcnt; ++i) - fd_event ( - EV_A_ - polls [i].fd, - (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) - | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) - ); + if (polls [i].revents & POLLNVAL) + fd_kill (EV_A_ polls [i].fd); + else + fd_event ( + EV_A_ + polls [i].fd, + (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) + | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) + ); } static int