From 4cfacffa795c41e117a02c21741a0868168f3a10 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Thu, 1 Apr 2004 10:36:40 +0000
Subject: 	* net.cc (wsock_event::wait): Make wsa_err an int.  Don't set 
 ret to 0 if any error has happened.

---
 winsup/cygwin/net.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'winsup/cygwin/net.cc')

diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 2459580b5..4f8ee3d12 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -69,7 +69,7 @@ int
 wsock_event::wait (int sock, int &closed)
 {
   int ret = SOCKET_ERROR;
-  DWORD wsa_err = 0;
+  int wsa_err = 0;
   WSAEVENT ev[2] = { event, signal_arrived };
   switch (WSAWaitForMultipleEvents (2, ev, FALSE, WSA_INFINITE, FALSE))
     {
@@ -94,10 +94,13 @@ wsock_event::wait (int sock, int &closed)
 	    if (evts.lNetworkEvents & FD_CLOSE)
 	      {
 		closed = 1;
-		if (!wsa_err && evts.iErrorCode[FD_CLOSE_BIT])
-		  wsa_err = evts.iErrorCode[FD_CLOSE_BIT];
-		else
-		  ret = 0;
+		if (!wsa_err)
+		  {
+		    if (evts.iErrorCode[FD_CLOSE_BIT])
+		      wsa_err = evts.iErrorCode[FD_CLOSE_BIT];
+		    else
+		      ret = 0;
+		  }
 	      }
 	    if (wsa_err)
 	      WSASetLastError (wsa_err);
-- 
cgit v1.2.3