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

defined. ok miod@ beck@
author: jsing <> 2014-04-16 13:01:09 +0000
committer: jsing <> 2014-04-16 13:01:09 +0000
commit: fe3d1685b68e44ed30e549a3cc305ba88b3e6d93 (patch)
tree: 35e30e89f5fd00b39058da472c26f78edc79e58d /src
parent: a52a80bf202fc10d585e012c9330bd32bafb9283 (diff)
download: openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.tar.gz
openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.tar.bz2
openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.zip
6 files changed, 0 insertions, 210 deletions
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index 328bab9ce3..9219fffc8d 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/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/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index 86757154e8..c0e7f08fbb 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/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/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 30640d8f96..c05b8d37f1 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/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/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c
index 328bab9ce3..9219fffc8d 100644
--- a/src/lib/libssl/src/crypto/bio/bss_dgram.c
+++ b/src/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/src/lib/libssl/src/crypto/bio/bss_fd.c b/src/lib/libssl/src/crypto/bio/bss_fd.c
index 86757154e8..c0e7f08fbb 100644
--- a/src/lib/libssl/src/crypto/bio/bss_fd.c
+++ b/src/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/src/lib/libssl/src/crypto/bio/bss_sock.c b/src/lib/libssl/src/crypto/bio/bss_sock.c
index 30640d8f96..c05b8d37f1 100644
--- a/src/lib/libssl/src/crypto/bio/bss_sock.c
+++ b/src/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;
        }
author	jsing <>	2014-04-16 13:01:09 +0000
committer	jsing <>	2014-04-16 13:01:09 +0000
commit	fe3d1685b68e44ed30e549a3cc305ba88b3e6d93 (patch)
tree	35e30e89f5fd00b39058da472c26f78edc79e58d /src
parent	a52a80bf202fc10d585e012c9330bd32bafb9283 (diff)
download	openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.tar.gz openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.tar.bz2 openbsd-fe3d1685b68e44ed30e549a3cc305ba88b3e6d93.zip

diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index 328bab9ce3..9219fffc8d 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -1687,41 +1687,11 @@ int
1687	BIO_dgram_non_fatal_error(int err)	1687	BIO_dgram_non_fatal_error(int err)
1688	{	1688	{
1689	switch (err) {	1689	switch (err) {
1690
1691	#ifdef EWOULDBLOCK
1692	# ifdef WSAEWOULDBLOCK
1693	# if WSAEWOULDBLOCK != EWOULDBLOCK
1694	case EWOULDBLOCK:
1695	# endif
1696	# else
1697	case EWOULDBLOCK:
1698	# endif
1699	#endif
1700
1701	#ifdef EINTR
1702	case EINTR:	1690	case EINTR:
1703	#endif
1704
1705	#ifdef EAGAIN
1706	#if EWOULDBLOCK != EAGAIN
1707	case EAGAIN:	1691	case EAGAIN:
1708	# endif
1709	#endif
1710
1711	#ifdef EPROTO
1712	case EPROTO:
1713	#endif
1714
1715	#ifdef EINPROGRESS
1716	case EINPROGRESS:	1692	case EINPROGRESS:
1717	#endif
1718
1719	#ifdef EALREADY
1720	case EALREADY:	1693	case EALREADY:
1721	#endif
1722
1723	return (1);	1694	return (1);
1724	/* break; */
1725	default:	1695	default:
1726	break;	1696	break;
1727	}	1697	}


diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c index 86757154e8..c0e7f08fbb 100644 --- a/src/lib/libcrypto/bio/bss_fd.c +++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -270,44 +270,12 @@ int
270	BIO_fd_non_fatal_error(int err)	270	BIO_fd_non_fatal_error(int err)
271	{	271	{
272	switch (err) {	272	switch (err) {
273
274	#ifdef EWOULDBLOCK
275	# ifdef WSAEWOULDBLOCK
276	# if WSAEWOULDBLOCK != EWOULDBLOCK
277	case EWOULDBLOCK:
278	# endif
279	# else
280	case EWOULDBLOCK:
281	# endif
282	#endif
283
284	#if defined(ENOTCONN)
285	case ENOTCONN:	273	case ENOTCONN:
286	#endif
287
288	#ifdef EINTR
289	case EINTR:	274	case EINTR:
290	#endif
291
292	#ifdef EAGAIN
293	#if EWOULDBLOCK != EAGAIN
294	case EAGAIN:	275	case EAGAIN:
295	# endif
296	#endif
297
298	#ifdef EPROTO
299	case EPROTO:
300	#endif
301
302	#ifdef EINPROGRESS
303	case EINPROGRESS:	276	case EINPROGRESS:
304	#endif
305
306	#ifdef EALREADY
307	case EALREADY:	277	case EALREADY:
308	#endif
309	return (1);	278	return (1);
310	/* break; */
311	default:	279	default:
312	break;	280	break;
313	}	281	}


diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c index 30640d8f96..c05b8d37f1 100644 --- a/src/lib/libcrypto/bio/bss_sock.c +++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -233,55 +233,12 @@ int
233	BIO_sock_non_fatal_error(int err)	233	BIO_sock_non_fatal_error(int err)
234	{	234	{
235	switch (err) {	235	switch (err) {
236	#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_NETWARE)
237	# if defined(WSAEWOULDBLOCK)
238	case WSAEWOULDBLOCK:
239	# endif
240
241	# if 0 /* This appears to always be an error */
242	# if defined(WSAENOTCONN)
243	case WSAENOTCONN:
244	# endif
245	# endif
246	#endif
247
248	#ifdef EWOULDBLOCK
249	# ifdef WSAEWOULDBLOCK
250	# if WSAEWOULDBLOCK != EWOULDBLOCK
251	case EWOULDBLOCK:
252	# endif
253	# else
254	case EWOULDBLOCK:
255	# endif
256	#endif
257
258	#if defined(ENOTCONN)
259	case ENOTCONN:	236	case ENOTCONN:
260	#endif
261
262	#ifdef EINTR
263	case EINTR:	237	case EINTR:
264	#endif
265
266	#ifdef EAGAIN
267	# if EWOULDBLOCK != EAGAIN
268	case EAGAIN:	238	case EAGAIN:
269	# endif
270	#endif
271
272	#ifdef EPROTO
273	case EPROTO:
274	#endif
275
276	#ifdef EINPROGRESS
277	case EINPROGRESS:	239	case EINPROGRESS:
278	#endif
279
280	#ifdef EALREADY
281	case EALREADY:	240	case EALREADY:
282	#endif
283	return (1);	241	return (1);
284	/* break; */
285	default:	242	default:
286	break;	243	break;
287	}	244	}


diff --git a/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c index 328bab9ce3..9219fffc8d 100644 --- a/src/lib/libssl/src/crypto/bio/bss_dgram.c +++ b/src/lib/libssl/src/crypto/bio/bss_dgram.c
@@ -1687,41 +1687,11 @@ int
1687	BIO_dgram_non_fatal_error(int err)	1687	BIO_dgram_non_fatal_error(int err)
1688	{	1688	{
1689	switch (err) {	1689	switch (err) {
1690
1691	#ifdef EWOULDBLOCK
1692	# ifdef WSAEWOULDBLOCK
1693	# if WSAEWOULDBLOCK != EWOULDBLOCK
1694	case EWOULDBLOCK:
1695	# endif
1696	# else
1697	case EWOULDBLOCK:
1698	# endif
1699	#endif
1700
1701	#ifdef EINTR
1702	case EINTR:	1690	case EINTR:
1703	#endif
1704
1705	#ifdef EAGAIN
1706	#if EWOULDBLOCK != EAGAIN
1707	case EAGAIN:	1691	case EAGAIN:
1708	# endif
1709	#endif
1710
1711	#ifdef EPROTO
1712	case EPROTO:
1713	#endif
1714
1715	#ifdef EINPROGRESS
1716	case EINPROGRESS:	1692	case EINPROGRESS:
1717	#endif
1718
1719	#ifdef EALREADY
1720	case EALREADY:	1693	case EALREADY:
1721	#endif
1722
1723	return (1);	1694	return (1);
1724	/* break; */
1725	default:	1695	default:
1726	break;	1696	break;
1727	}	1697	}


diff --git a/src/lib/libssl/src/crypto/bio/bss_fd.c b/src/lib/libssl/src/crypto/bio/bss_fd.c index 86757154e8..c0e7f08fbb 100644 --- a/src/lib/libssl/src/crypto/bio/bss_fd.c +++ b/src/lib/libssl/src/crypto/bio/bss_fd.c
@@ -270,44 +270,12 @@ int
270	BIO_fd_non_fatal_error(int err)	270	BIO_fd_non_fatal_error(int err)
271	{	271	{
272	switch (err) {	272	switch (err) {
273
274	#ifdef EWOULDBLOCK
275	# ifdef WSAEWOULDBLOCK
276	# if WSAEWOULDBLOCK != EWOULDBLOCK
277	case EWOULDBLOCK:
278	# endif
279	# else
280	case EWOULDBLOCK:
281	# endif
282	#endif
283
284	#if defined(ENOTCONN)
285	case ENOTCONN:	273	case ENOTCONN:
286	#endif
287
288	#ifdef EINTR
289	case EINTR:	274	case EINTR:
290	#endif
291
292	#ifdef EAGAIN
293	#if EWOULDBLOCK != EAGAIN
294	case EAGAIN:	275	case EAGAIN:
295	# endif
296	#endif
297
298	#ifdef EPROTO
299	case EPROTO:
300	#endif
301
302	#ifdef EINPROGRESS
303	case EINPROGRESS:	276	case EINPROGRESS:
304	#endif
305
306	#ifdef EALREADY
307	case EALREADY:	277	case EALREADY:
308	#endif
309	return (1);	278	return (1);
310	/* break; */
311	default:	279	default:
312	break;	280	break;
313	}	281	}


diff --git a/src/lib/libssl/src/crypto/bio/bss_sock.c b/src/lib/libssl/src/crypto/bio/bss_sock.c index 30640d8f96..c05b8d37f1 100644 --- a/src/lib/libssl/src/crypto/bio/bss_sock.c +++ b/src/lib/libssl/src/crypto/bio/bss_sock.c
@@ -233,55 +233,12 @@ int
233	BIO_sock_non_fatal_error(int err)	233	BIO_sock_non_fatal_error(int err)
234	{	234	{
235	switch (err) {	235	switch (err) {
236	#if defined(OPENSSL_SYS_WINDOWS) \|\| defined(OPENSSL_SYS_NETWARE)
237	# if defined(WSAEWOULDBLOCK)
238	case WSAEWOULDBLOCK:
239	# endif
240
241	# if 0 /* This appears to always be an error */
242	# if defined(WSAENOTCONN)
243	case WSAENOTCONN:
244	# endif
245	# endif
246	#endif
247
248	#ifdef EWOULDBLOCK
249	# ifdef WSAEWOULDBLOCK
250	# if WSAEWOULDBLOCK != EWOULDBLOCK
251	case EWOULDBLOCK:
252	# endif
253	# else
254	case EWOULDBLOCK:
255	# endif
256	#endif
257
258	#if defined(ENOTCONN)
259	case ENOTCONN:	236	case ENOTCONN:
260	#endif
261
262	#ifdef EINTR
263	case EINTR:	237	case EINTR:
264	#endif
265
266	#ifdef EAGAIN
267	# if EWOULDBLOCK != EAGAIN
268	case EAGAIN:	238	case EAGAIN:
269	# endif
270	#endif
271
272	#ifdef EPROTO
273	case EPROTO:
274	#endif
275
276	#ifdef EINPROGRESS
277	case EINPROGRESS:	239	case EINPROGRESS:
278	#endif
279
280	#ifdef EALREADY
281	case EALREADY:	240	case EALREADY:
282	#endif
283	return (1);	241	return (1);
284	/* break; */
285	default:	242	default:
286	break;	243	break;
287	}	244	}