httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/win32 sockaddr.c sockets.c sockopt.c
Date Mon, 10 Apr 2000 21:09:10 GMT
stoddard    00/04/10 14:09:10

  Modified:    src/lib/apr/network_io/win32 sockaddr.c sockets.c sockopt.c
  Log:
  Fix Windows compile breaks due to recent error reporting/message changes
  
  Revision  Changes    Path
  1.6       +2 -2      apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sockaddr.c	2000/04/03 19:45:14	1.5
  +++ sockaddr.c	2000/04/10 21:09:09	1.6
  @@ -141,7 +141,7 @@
       ipaddr = inet_addr(addr);
       
       if (ipaddr == INADDR_NONE) {
  -        return APR_ENOADDRESS;
  +        return WSAEADDRNOTAVAIL;
       }
       
       sock->local_addr->sin_addr.s_addr = ipaddr;
  @@ -168,7 +168,7 @@
       ipaddr = inet_addr(addr);
       
       if (ipaddr == INADDR_NONE) {
  -        return APR_ENOADDRESS;
  +        return WSAEADDRNOTAVAIL;
       }
       
       sock->remote_addr->sin_addr.s_addr = ipaddr;
  
  
  
  1.24      +1 -1      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- sockets.c	2000/04/03 19:45:15	1.23
  +++ sockets.c	2000/04/10 21:09:09	1.24
  @@ -201,7 +201,7 @@
       else {
           hp = gethostbyname(hostname);
           if (!hp)  {
  -            return status_from_res_error(WSAGetLastError());
  +            return (WSAGetLastError() + APR_OS_START_SYSERR);
           }
           memcpy((char *)&sock->remote_addr->sin_addr, hp->h_addr_list[0], hp->h_length);
           sock->addr_len = sizeof(*sock->remote_addr);
  
  
  
  1.12      +3 -2      apache-2.0/src/lib/apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- sockopt.c	2000/04/03 19:45:15	1.11
  +++ sockopt.c	2000/04/10 21:09:09	1.12
  @@ -156,9 +156,9 @@
           return APR_ENOMEM;
       }
   
  -    return status_from_res_error(WSAGetLastError());
  +    return (WSAGetLastError() + APR_OS_START_SYSERR);
   }
  -
  +#if 0
   ap_status_t status_from_res_error(int reserr)
   {
       ap_status_t status;
  @@ -180,5 +180,6 @@
       }
       return status;
   }
  +#endif
   
   
  
  
  

Mime
View raw message