diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2004-03-31 09:13:54 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2004-03-31 09:13:54 +0000 |
| commit | 4450172a6c9a97bf9ec6ec1504f0297defe47cb4 (patch) | |
| tree | bb833b31565cc89535e4eeb71ab634d59f208219 /winsup/cygwin/net.cc | |
| parent | ed4c5eceb09c54c9d683229262e8740b808f401e (diff) | |
| download | cygnal-4450172a6c9a97bf9ec6ec1504f0297defe47cb4.tar.gz cygnal-4450172a6c9a97bf9ec6ec1504f0297defe47cb4.tar.bz2 cygnal-4450172a6c9a97bf9ec6ec1504f0297defe47cb4.zip | |
* fhandler_socket.cc (fhandler_socket::recvfrom): Initialize res to
SOCKET_ERROR. Use SOCKET_ERROR instead of -1 throughout.
(fhandler_socket::recvmsg): Ditto.
(fhandler_socket::sendto): Ditto.
(fhandler_socket::sendmsg): Ditto.
* net.cc (wsock_event::prepare): Call WSASetLastError instead of
SetLastError.
(wsock_event::wait): Use SOCKET_ERROR instead of -1.
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 3d76a433b..b53dacdf7 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -53,7 +53,7 @@ extern "C" bool wsock_event::prepare (int sock, long event_mask) { - SetLastError (0); + WSASetLastError (0); if ((event = WSACreateEvent ()) != WSA_INVALID_EVENT && WSAEventSelect (sock, event, event_mask) == SOCKET_ERROR) { @@ -67,7 +67,7 @@ wsock_event::prepare (int sock, long event_mask) int wsock_event::wait (int sock, int &closed) { - int ret = -1; + int ret = SOCKET_ERROR; DWORD wsa_err = 0; WSAEVENT ev[2] = { event, signal_arrived }; switch (WSAWaitForMultipleEvents (2, ev, FALSE, WSA_INFINITE, FALSE)) |