JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2009-12-28 17:24:03 +00:00
parent 1c0a4c3a8e
commit 935d37f116
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2009-12-28 Corinna Vinschen <corinna@vinschen.de>
* 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.
2009-12-26 Eric Blake <ebb9@byu.net> 2009-12-26 Eric Blake <ebb9@byu.net>
* include/pty.h (openpty, forkpty): Mark last two arguments const, * include/pty.h (openpty, forkpty): Mark last two arguments const,

2
winsup/cygwin/fhandler.h
View File

@ -433,7 +433,7 @@ class fhandler_socket: public fhandler_base
const HANDLE wsock_event () const { return wsock_evt; } const HANDLE wsock_event () const { return wsock_evt; }
const LONG serial_number () const { return wsock_events->serial_number; } const LONG serial_number () const { return wsock_events->serial_number; }
private: private:
int wait_for_events (const long event_mask, bool dontwait = false); int wait_for_events (const long event_mask, bool dontwait);
void release_events (); void release_events ();
pid_t sec_pid; pid_t sec_pid;

6
winsup/cygwin/fhandler_socket.cc
View File

@ -1099,7 +1099,7 @@ fhandler_socket::connect (const struct sockaddr *name, int namelen)
if (!is_nonblocking () if (!is_nonblocking ()
&& res == SOCKET_ERROR && res == SOCKET_ERROR
&& WSAGetLastError () == WSAEWOULDBLOCK) && WSAGetLastError () == WSAEWOULDBLOCK)
res = wait_for_events (FD_CONNECT | FD_CLOSE); res = wait_for_events (FD_CONNECT | FD_CLOSE, false);
if (!res) if (!res)
err = 0; err = 0;
@ -1200,7 +1200,7 @@ fhandler_socket::accept (struct sockaddr *peer, int *len)
int llen = sizeof (struct sockaddr_storage); int llen = sizeof (struct sockaddr_storage);
int res = 0; 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)) && (res = ::accept (get_socket (), (struct sockaddr *) &lpeer, &llen))
== SOCKET_ERROR == SOCKET_ERROR
&& WSAGetLastError () == WSAEWOULDBLOCK) && WSAGetLastError () == WSAEWOULDBLOCK)
@ -1646,7 +1646,7 @@ fhandler_socket::send_internal (struct _WSAMSG *wsamsg, int flags)
} }
} }
while (res && err == WSAEWOULDBLOCK while (res && err == WSAEWOULDBLOCK
&& !(res = wait_for_events (FD_WRITE | FD_CLOSE), dontwait)); && !(res = wait_for_events (FD_WRITE | FD_CLOSE, dontwait)));
if (!res) if (!res)
{ {