cvs commit: apache-2.0/src/lib/apr/network_io/win32 sockets.c poll.c

[stoddard]

stoddard    99/10/04 15:44:21

  Modified:    src/lib/apr/network_io/win32 sockets.c poll.c
  Log:
  A few more argument changes missed by Ryan's patch
  
  Revision  Changes    Path
  1.6       +3 -3      apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sockets.c 1999/10/04 17:55:48     1.5
  +++ sockets.c 1999/10/04 22:44:18     1.6
  @@ -267,7 +267,7 @@
   ap_status_t ap_get_socketdata(struct socket_t *socket, char *key, void *data)
   {
       if (socket != NULL) {
  -        return ap_get_userdata(socket->cntxt, key, &data);
  +        return ap_get_userdata(&data, socket->cntxt, key);
       }
       else {
           data = NULL;
  @@ -296,8 +296,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(ap_context_t *cont, struct socket_t **sock,
  -                            ap_os_sock_t *thesock)
  +ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +                           ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- poll.c    1999/10/04 16:37:16     1.3
  +++ poll.c    1999/10/04 22:44:19     1.4
  @@ -199,7 +199,7 @@
   ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
  -        return ap_get_userdata(pollfd->cntxt, key, &data);
  +        return ap_get_userdata(&data, pollfd->cntxt, key);
       }
       else {
           data = NULL;