Getting closer to 1.0 - eliminate APR_SO_TIMEOUT and replace

  various tests with (sock->timeout > 0).

  Also mop up some very hard to read statements by liberally
  applying parens.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64778 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 8 deletions

diff --git a/network_io/os2/sockopt.c b/network_io/os2/sockopt.c
index b188f90ea..63f5c9211 100644
--- a/network_io/os2/sockopt.c
+++ b/network_io/os2/sockopt.c
@@ -120,10 +120,6 @@ APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
             return APR_OS2_STATUS(sock_errno());
         }
     }
-    if (opt & APR_SO_TIMEOUT) {
-        /* XXX: To be deprecated */
-        return apr_socket_timeout_set(sock, on);
-    }
     if (opt & APR_TCP_NODELAY) {
         if (setsockopt(sock->socketdes, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(int)) == -1) {
             return APR_OS2_STATUS(sock_errno());
@@ -145,10 +141,6 @@ APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
                                              apr_int32_t opt, apr_int32_t *on)
 {
     switch(opt) {
-    case APR_SO_TIMEOUT:
-        /* XXX: To be deprecated */
-        *on = (apr_int32_t)sock->timeout;
-        break;
     default:
         return APR_EINVAL;
     }