cvs commit: apr/network_io/os2 sockopt.c

[wrowe]

wrowe       2002/07/14 23:12:28

  Modified:    network_io/unix sockopt.c
               network_io/os2 sockopt.c
  Log:
    Too literal.  These aught to compile now.
  
  Revision  Changes    Path
  1.54      +5 -3      apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- sockopt.c 15 Jul 2002 06:10:00 -0000      1.53
  +++ sockopt.c 15 Jul 2002 06:12:28 -0000      1.54
  @@ -113,20 +113,22 @@
   
   APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, 
apr_interval_time_t t)
   {
  +    apr_status_t stat;
  +
       /* If our timeout is positive or zero and our last timeout was
        * negative, then we need to ensure that we are non-blocking.
        * Conversely, if our timeout is negative and we had a positive
        * or zero timeout, we must make sure our socket is blocking.
        * We want to avoid calling fcntl more than necessary on the socket,
        */
  -    if (on >= 0 && sock->timeout < 0){
  +    if (t >= 0 && sock->timeout < 0){
           if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 1){
               if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS){
                   return stat;
               }
           }
       } 
  -    else if (on < 0 && sock->timeout >= 0){
  +    else if (t < 0 && sock->timeout >= 0){
           if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 0){ 
               if ((stat = soblock(sock->socketdes)) != APR_SUCCESS) { 
                   return stat; 
  @@ -136,7 +138,7 @@
       /* must disable the incomplete read support if we change to a
        * blocking socket.
        */
  -    if (on == 0) {
  +    if (t == 0) {
           sock->netmask &= ~APR_INCOMPLETE_READ;
       }
       sock->timeout = t; 
  
  
  
  1.26      +1 -1      apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- sockopt.c 15 Jul 2002 06:10:00 -0000      1.25
  +++ sockopt.c 15 Jul 2002 06:12:28 -0000      1.26
  @@ -69,7 +69,7 @@
   
   APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, 
apr_interval_time_t t)
   {
  -    sock->timeout = on;
  +    sock->timeout = t;
       return APR_SUCCESS;
   }