* 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.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e5d3499..a124124 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -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>
 
        * include/pty.h (openpty, forkpty): Mark last two arguments const,

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 8cae118..0974e61 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -433,7 +433,7 @@ class fhandler_socket: public fhandler_base
   const HANDLE wsock_event () const { return wsock_evt; }
   const LONG serial_number () const { return wsock_events->serial_number; }
  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 ();
 
   pid_t     sec_pid;

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 746d7e3..f676f85 100644 (file)
--- 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)
        {