Clean up non-fatal error handling - we know which error numbers we have

defined.

ok miod@ beck@

diff --git a/lib/libcrypto/bio/bss_dgram.c b/lib/libcrypto/bio/bss_dgram.c
index 328bab9..9219fff 100644 (file)
--- a/lib/libcrypto/bio/bss_dgram.c
+++ b/lib/libcrypto/bio/bss_dgram.c
@@ -1687,41 +1687,11 @@ int
 BIO_dgram_non_fatal_error(int err)
 {
        switch (err) {
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
-
                return (1);
-               /* break; */
        default:
                break;
        }

diff --git a/lib/libcrypto/bio/bss_fd.c b/lib/libcrypto/bio/bss_fd.c
index 8675715..c0e7f08 100644 (file)
--- a/lib/libcrypto/bio/bss_fd.c
+++ b/lib/libcrypto/bio/bss_fd.c
@@ -270,44 +270,12 @@ int
 BIO_fd_non_fatal_error(int err)
 {
        switch (err) {
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#if defined(ENOTCONN)
        case ENOTCONN:
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
                return (1);
-               /* break; */
        default:
                break;
        }

diff --git a/lib/libcrypto/bio/bss_sock.c b/lib/libcrypto/bio/bss_sock.c
index 30640d8..c05b8d3 100644 (file)
--- a/lib/libcrypto/bio/bss_sock.c
+++ b/lib/libcrypto/bio/bss_sock.c
@@ -233,55 +233,12 @@ int
 BIO_sock_non_fatal_error(int err)
 {
        switch (err) {
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
-# if defined(WSAEWOULDBLOCK)
-       case WSAEWOULDBLOCK:
-# endif
-
-# if 0 /* This appears to always be an error */
-#  if defined(WSAENOTCONN)
-       case WSAENOTCONN:
-#  endif
-# endif
-#endif
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#if defined(ENOTCONN)
        case ENOTCONN:
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-# if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
                return (1);
-               /* break; */
        default:
                break;
        }

diff --git a/lib/libssl/src/crypto/bio/bss_dgram.c b/lib/libssl/src/crypto/bio/bss_dgram.c
index 328bab9..9219fff 100644 (file)
--- a/lib/libssl/src/crypto/bio/bss_dgram.c
+++ b/lib/libssl/src/crypto/bio/bss_dgram.c
@@ -1687,41 +1687,11 @@ int
 BIO_dgram_non_fatal_error(int err)
 {
        switch (err) {
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
-
                return (1);
-               /* break; */
        default:
                break;
        }

diff --git a/lib/libssl/src/crypto/bio/bss_fd.c b/lib/libssl/src/crypto/bio/bss_fd.c
index 8675715..c0e7f08 100644 (file)
--- a/lib/libssl/src/crypto/bio/bss_fd.c
+++ b/lib/libssl/src/crypto/bio/bss_fd.c
@@ -270,44 +270,12 @@ int
 BIO_fd_non_fatal_error(int err)
 {
        switch (err) {
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#if defined(ENOTCONN)
        case ENOTCONN:
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
                return (1);
-               /* break; */
        default:
                break;
        }

diff --git a/lib/libssl/src/crypto/bio/bss_sock.c b/lib/libssl/src/crypto/bio/bss_sock.c
index 30640d8..c05b8d3 100644 (file)
--- a/lib/libssl/src/crypto/bio/bss_sock.c
+++ b/lib/libssl/src/crypto/bio/bss_sock.c
@@ -233,55 +233,12 @@ int
 BIO_sock_non_fatal_error(int err)
 {
        switch (err) {
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
-# if defined(WSAEWOULDBLOCK)
-       case WSAEWOULDBLOCK:
-# endif
-
-# if 0 /* This appears to always be an error */
-#  if defined(WSAENOTCONN)
-       case WSAENOTCONN:
-#  endif
-# endif
-#endif
-
-#ifdef EWOULDBLOCK
-# ifdef WSAEWOULDBLOCK
-#  if WSAEWOULDBLOCK != EWOULDBLOCK
-       case EWOULDBLOCK:
-#  endif
-# else
-       case EWOULDBLOCK:
-# endif
-#endif
-
-#if defined(ENOTCONN)
        case ENOTCONN:
-#endif
-
-#ifdef EINTR
        case EINTR:
-#endif
-
-#ifdef EAGAIN
-# if EWOULDBLOCK != EAGAIN
        case EAGAIN:
-# endif
-#endif
-
-#ifdef EPROTO
-       case EPROTO:
-#endif
-
-#ifdef EINPROGRESS
        case EINPROGRESS:
-#endif
-
-#ifdef EALREADY
        case EALREADY:
-#endif
                return (1);
-               /* break; */
        default:
                break;
        }