From 181b0d47830696eecbfbfe694056de4ded76644d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Aug 2009 15:32:23 +0000
Subject: merges r24367 from trunk into ruby_1_9_1. -- 	* win32/win32.c
 (rb_w32_connect): return value was broken when some 	  error occurred. 
   [ruby-core:24234]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'win32')

diff --git a/win32/win32.c b/win32/win32.c
index b948fe0d7..bf405e0e6 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2394,14 +2394,11 @@ rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
     RUBY_CRITICAL({
 	r = connect(TO_SOCKET(s), addr, addrlen);
 	if (r == SOCKET_ERROR) {
-	    r = WSAGetLastError();
-	    if (r != WSAEWOULDBLOCK) {
-		errno = map_errno(r);
-	    }
-	    else {
+	    int err = WSAGetLastError();
+	    if (err != WSAEWOULDBLOCK)
+		errno = map_errno(err);
+	    else
 		errno = EINPROGRESS;
-		r = -1;
-	    }
 	}
     });
     return r;
-- 
cgit