Windows: if WSA error number is held, use directly.

It must be done this way, as WSAGetLastError returns 0 in these circumstances

Windows: if WSA error number is held, use directly.
It must be done this way, as WSAGetLastError returns 0 in these circumstances
993cb32e · Tom Whittock · 660bf431 · 993cb32e
Commit 993cb32e authored Jul 07, 2014 by Tom Whittock
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 9 deletions

tcp_connecter.cpp src/tcp_connecter.cpp +12 -9

No files found.
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -303,15 +303,18 @@ zmq::fd_t zmq::tcp_connecter_t::connect ()
 #ifdef ZMQ_HAVE_WINDOWS
    zmq_assert (rc == 0);
    if (err != 0) {
-        wsa_assert (err == WSAECONNREFUSED
+        if (err != WSAECONNREFUSED
-                 || err == WSAETIMEDOUT
+            && err != WSAETIMEDOUT
-                 || err == WSAECONNABORTED
+            && err != WSAECONNABORTED
-                 || err == WSAEHOSTUNREACH
+            && err != WSAEHOSTUNREACH
-                 || err == WSAENETUNREACH
+            && err != WSAENETUNREACH
-                 || err == WSAENETDOWN
+            && err != WSAENETDOWN
-                 || err == WSAEACCES
+            && err != WSAEACCES
-                 || err == WSAEINVAL
+            && err != WSAEINVAL
-                 || err == WSAEADDRINUSE);
+            && err != WSAEADDRINUSE)
+        {
+            wsa_assert_no (err);
+        }
        return retired_fd;
    }
 #else