Merge pull request #4390

laanwj · laanwj · commit 27383b9015e2 · 2014-06-25T07:20:42.000+02:00
6dc90ed replace 3 separate calls to WSAGetLastError() with 1 (Philip Kaufmann)
diff --git a/src/netbase.cpp b/src/netbase.cpp
@@ -337,8 +337,9 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
 
     if (connect(hSocket, (struct sockaddr*)&sockaddr, len) == SOCKET_ERROR)
     {
+        int nErr = WSAGetLastError();
         // WSAEINVAL is here because some legacy version of winsock uses it
-        if (WSAGetLastError() == WSAEINPROGRESS || WSAGetLastError() == WSAEWOULDBLOCK || WSAGetLastError() == WSAEINVAL)
+        if (nErr == WSAEINPROGRESS || nErr == WSAEWOULDBLOCK || nErr == WSAEINVAL)
         {
             struct timeval timeout;
             timeout.tv_sec  = nTimeout / 1000;

Original file line number	Diff line number	Diff line change
`@@ -337,8 +337,9 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe`
`337`	`337`
`338`	`338`	`if (connect(hSocket, (struct sockaddr*)&sockaddr, len) == SOCKET_ERROR)`
`339`	`339`	`{`
	`340`	`+ int nErr = WSAGetLastError();`
`340`	`341`	`// WSAEINVAL is here because some legacy version of winsock uses it`
`341`		`- if (WSAGetLastError() == WSAEINPROGRESS \|\| WSAGetLastError() == WSAEWOULDBLOCK \|\| WSAGetLastError() == WSAEINVAL)`
	`342`	`+ if (nErr == WSAEINPROGRESS \|\| nErr == WSAEWOULDBLOCK \|\| nErr == WSAEINVAL)`
`342`	`343`	`{`
`343`	`344`	`struct timeval timeout;`
`344`	`345`	`timeout.tv_sec = nTimeout / 1000;`