From 4450172a6c9a97bf9ec6ec1504f0297defe47cb4 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 31 Mar 2004 09:13:54 +0000 Subject: * 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. --- winsup/cygwin/net.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/net.cc') diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 3d76a43..b53dacd 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)) -- cgit v1.1