* fhandler_socket.cc (fhandler_socket::evaluate_events): Make erase

const in parameter list.
	(fhandler_socket::wait_for_events): Take a DWORD flags value instead of
	just a bool.  Call evaluate_events with erase flag according to
	MSG_PEEK value in flags.  Replace check for dontwait with check for
	MSG_DONTWAIT in flags.
	(fhandler_socket::connect): Call wait_for_events with 0 flags value.
	(fhandler_socket::accept4): Ditto.
	(fhandler_socket::recv_internal): Save flags in wait_flags.  Drop
	dontwait variable.  Call wait_for_events with wait_flags.
	(fhandler_socket::send_internal): Save MSG_DONTWAIT flag in wait_flags
	and call wait_for_events with wait_flags as argument.  Drop dontwait
	variable.
	* fhandler.h (class fhandler_socket): Change second parameter in
	declaration of wait_for_events to const DWORD.
This commit is contained in:
Corinna Vinschen
2010-03-22 10:47:53 +00:00
parent 0f6de51ae2
commit 65b4b495c6
3 changed files with 31 additions and 12 deletions

View File

@ -432,7 +432,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);
int wait_for_events (const long event_mask, const DWORD flags);
void release_events ();
pid_t sec_pid;