httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/beos poll.c
Date Fri, 08 Oct 1999 11:12:15 GMT
dreid       99/10/08 04:12:15

  Modified:    src/lib/apr/network_io/beos poll.c
  Log:
  This bring beos poll back into line with APR.
  
  Revision  Changes    Path
  1.3       +6 -7      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- poll.c	1999/09/07 13:16:48	1.2
  +++ poll.c	1999/10/08 11:12:14	1.3
  @@ -68,8 +68,7 @@
   /*  select for R4.5 of BeOS.  So here we use code that uses the write */
   /*  bits. */
       
  -ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct pollfd_t **
  -new)
  +ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont, ap_int32_t num)
   {
       (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
       if ((*new) == NULL) {
  @@ -208,10 +207,10 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(struct pollfd_t *pollfd, void *data)
  +ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
  -        return ap_get_userdata(pollfd->cntxt, &data);
  +        return ap_get_userdata(&data, pollfd->cntxt, key);
       }
       else {
           data = NULL;
  @@ -219,14 +218,14 @@
       }
   }
   
  -ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data)
  +ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data, char *key,
  +                            ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  -        return ap_set_userdata(pollfd->cntxt, data);
  +        return ap_set_userdata(pollfd->cntxt, data, key, cleanup);
       }
       else {
           data = NULL;
           return APR_ENOFILE;
       }
   }
  -
  
  
  

Mime
View raw message