poll: Introduce and use BEFOREPOLL_WANT_FDS

[secnet] / slip.c

diff --git a/slip.c b/slip.c
index d8b32d8dbda79b5ad8ad4432be2adb4d3a166a10..1a60f40f64490f89f3b6533a55116b3d93d50b7e 100644 (file)
--- a/slip.c
+++ b/slip.c
@@ -170,13 +170,13 @@ static int userv_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
     struct userv *st=sst;
 
     if (st->rxfd!=-1) {
     struct userv *st=sst;
 
     if (st->rxfd!=-1) {

-       *nfds_io=2;
+       BEFOREPOLL_WANT_FDS(2);

        fds[0].fd=st->txfd;
        fds[0].events=0; /* Might want to pick up POLLOUT sometime */
        fds[1].fd=st->rxfd;
        fds[1].events=POLLIN;
     } else {
        fds[0].fd=st->txfd;
        fds[0].events=0; /* Might want to pick up POLLOUT sometime */
        fds[1].fd=st->rxfd;
        fds[1].events=POLLIN;
     } else {

-       *nfds_io=0;
+       BEFOREPOLL_WANT_FDS(0);

     }
     return 0;
 }
     }
     return 0;
 }