httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/unix poll.c
Date Thu, 27 Apr 2000 22:45:24 GMT
dreid       00/04/27 15:45:24

  Modified:    src/lib/apr/network_io/beos poll.c
               src/lib/apr/network_io/unix poll.c
  Log:
  Change the ap_remove_poll_socket functions to work with the new
  prototype where select is being used.  We don't care about what we
  were looking for when we remove them, so just remove them!
  
  Revision  Changes    Path
  1.14      +4 -11     apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- poll.c	2000/04/16 02:27:53	1.13
  +++ poll.c	2000/04/27 22:45:23	1.14
  @@ -171,18 +171,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, 
  -                                  ap_socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
   {
  -    if (events & APR_POLLIN) {
  -        FD_CLR(sock->socketdes, aprset->read);
  -    }
  -    if (events & APR_POLLPRI) {
  -        FD_CLR(sock->socketdes, aprset->read);
  -    }
  -    if (events & APR_POLLOUT) {
  -        FD_CLR(sock->socketdes, aprset->write);
  -    }
  +    FD_CLR(sock->socketdes, aprset->read);
  +    FD_CLR(sock->socketdes, aprset->read);
  +    FD_CLR(sock->socketdes, aprset->write);
       return APR_SUCCESS;
   }
   
  
  
  
  1.29      +4 -11     apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- poll.c	2000/04/27 20:11:31	1.28
  +++ poll.c	2000/04/27 22:45:24	1.29
  @@ -331,18 +331,11 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, 
  -                                  ap_socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(ap_pollfd_t *aprset, ap_socket_t *sock)
   {
  -    if (events & APR_POLLIN) {
  -        FD_CLR(sock->socketdes, aprset->read);
  -    }
  -    if (events & APR_POLLPRI) {
  -        FD_CLR(sock->socketdes, aprset->read);
  -    }
  -    if (events & APR_POLLOUT) {
  -        FD_CLR(sock->socketdes, aprset->write);
  -    }
  +    FD_CLR(sock->socketdes, aprset->read);
  +    FD_CLR(sock->socketdes, aprset->read);
  +    FD_CLR(sock->socketdes, aprset->write);
       return APR_SUCCESS;
   }
   
  
  
  

Mime
View raw message