diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2004-04-01 10:36:40 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2004-04-01 10:36:40 +0000 |
| commit | 4cfacffa795c41e117a02c21741a0868168f3a10 (patch) | |
| tree | 8a608c829f1a0286dc209bbefec18bd245a33f40 /winsup/cygwin/net.cc | |
| parent | 4fc406c935d3896553e5f925e271428f92996d3c (diff) | |
| download | cygnal-4cfacffa795c41e117a02c21741a0868168f3a10.tar.gz cygnal-4cfacffa795c41e117a02c21741a0868168f3a10.tar.bz2 cygnal-4cfacffa795c41e117a02c21741a0868168f3a10.zip | |
* net.cc (wsock_event::wait): Make wsa_err an int. Don't set
ret to 0 if any error has happened.
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 13 |
1 files changed, 8 insertions, 5 deletions
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); |