diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-12-28 17:24:03 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-12-28 17:24:03 +0000 |
| commit | 935d37f1160024347c979f54784b6030e270ddbf (patch) | |
| tree | f97d40d51297f3da622b27702cef189a93d2b47b /winsup/cygwin/fhandler_socket.cc | |
| parent | 1c0a4c3a8e679dbc8238d03b30e2fb76be9aec35 (diff) | |
| download | cygnal-935d37f1160024347c979f54784b6030e270ddbf.tar.gz cygnal-935d37f1160024347c979f54784b6030e270ddbf.tar.bz2 cygnal-935d37f1160024347c979f54784b6030e270ddbf.zip | |
* fhandler.h (fhandler_socket::wait_for_events): Drop parameter default
value.
* fhandler_socket.cc (fhandler_socket::connect): Add false as second
parameter to wait_for_events call.
(fhandler_socket::accept): Ditto.
(fhandler_socket::send_internal): Fix typo in call to wait_for_events.
Diffstat (limited to 'winsup/cygwin/fhandler_socket.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 746d7e3a8..f676f85ea 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1099,7 +1099,7 @@ fhandler_socket::connect (const struct sockaddr *name, int namelen) if (!is_nonblocking () && res == SOCKET_ERROR && WSAGetLastError () == WSAEWOULDBLOCK) - res = wait_for_events (FD_CONNECT | FD_CLOSE); + res = wait_for_events (FD_CONNECT | FD_CLOSE, false); if (!res) err = 0; @@ -1200,7 +1200,7 @@ fhandler_socket::accept (struct sockaddr *peer, int *len) int llen = sizeof (struct sockaddr_storage); int res = 0; - while (!(res = wait_for_events (FD_ACCEPT | FD_CLOSE)) + while (!(res = wait_for_events (FD_ACCEPT | FD_CLOSE, false)) && (res = ::accept (get_socket (), (struct sockaddr *) &lpeer, &llen)) == SOCKET_ERROR && WSAGetLastError () == WSAEWOULDBLOCK) @@ -1646,7 +1646,7 @@ fhandler_socket::send_internal (struct _WSAMSG *wsamsg, int flags) } } while (res && err == WSAEWOULDBLOCK - && !(res = wait_for_events (FD_WRITE | FD_CLOSE), dontwait)); + && !(res = wait_for_events (FD_WRITE | FD_CLOSE, dontwait))); if (!res) { |