cvs commit: apr/network_io/unix sockopt.c

[aaron]

aaron       2002/07/15 00:29:28

  Modified:    network_io/unix sockopt.c
  Log:
  Symbol rename ("stat") so we don't shadow a libc symbol of the same name.
  
  Revision  Changes    Path
  1.56      +9 -9      apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- sockopt.c 15 Jul 2002 07:12:26 -0000      1.55
  +++ sockopt.c 15 Jul 2002 07:29:28 -0000      1.56
  @@ -150,7 +150,7 @@
   apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, 
apr_int32_t on)
   {
       int one;
  -    apr_status_t stat;
  +    apr_status_t rv;
   
       if (on)
           one = 1;
  @@ -199,12 +199,12 @@
       if (opt & APR_SO_NONBLOCK) {
           if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != on){
               if (on) {
  -                if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS) 
  -                    return stat;
  +                if ((rv = sononblock(sock->socketdes)) != APR_SUCCESS) 
  +                    return rv;
               }
               else {
  -                if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
  -                    return stat;
  +                if ((rv = soblock(sock->socketdes)) != APR_SUCCESS)
  +                    return rv;
               }
               apr_set_option(&sock->netmask, APR_SO_NONBLOCK, on);
           }
  @@ -234,15 +234,15 @@
            */
           if (on >= 0 && sock->timeout < 0){
               if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 1){
  -                if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS){
  -                    return stat;
  +                if ((rv = sononblock(sock->socketdes)) != APR_SUCCESS){
  +                    return rv;
                   }
               }
           } 
           else if (on < 0 && sock->timeout >= 0){
               if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 0){ 
  -                if ((stat = soblock(sock->socketdes)) != APR_SUCCESS) { 
  -                    return stat; 
  +                if ((rv = soblock(sock->socketdes)) != APR_SUCCESS) { 
  +                    return rv; 
                   }
               } 
           }