From 9869e006f3ac34d7bd67fb6327f3605725995abc Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 27 Jul 2006 09:11:38 +0000 Subject: * fhandler.h (class fhandler_socket): Remove prot_info_ptr. (fhandler_socket::fixup_before_fork_exec): Remove. (fhandler_socket::fixup_after_exec): Remove. (fhandler_socket::need_fixup_before): Remove. * fhandler_socket.cc (fhandler_socket::fhandler_socket): Drop initializing prot_info_ptr. Remove unused code. (fhandler_socket::~fhandler_socket): Drop free'ing prot_info_ptr. (struct wsa_event): Rename connect_errorcode to errorcode. (fhandler_socket::evaluate_events): Handle FD_CLOSE error condition as FD_CONNECT error condition, except, never reset an FD_CLOSE error condition. Always set FD_WRITE after successfully recorded FD_CONNECT. (fhandler_socket::fixup_before_fork_exec): Remove. (fhandler_socket::fixup_after_fork): Revert to using handle duplication. (fhandler_socket::fixup_after_exec): Remove. (fhandler_socket::dup): Revert to using handle duplication. (fhandler_socket::send_internal): Only call wait_for_events in case of WSAEWOULDBLOCK condition. (fhandler_socket::set_close_on_exec): Call fhandler_base::set_close_on_exec. * net.cc (fdsock): Just set socket to inheritable on non-NT. Don't call inc_need_fixup_before. * select.cc (peek_socket): Don't set except_ready on every FD_CLOSE, just on error. --- winsup/cygwin/fhandler.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 6468560b3..7b9ba7e3b 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -418,7 +418,6 @@ class fhandler_socket: public fhandler_base void af_local_set_sockpair_cred (); private: - struct _WSAPROTOCOL_INFOA *prot_info_ptr; char *sun_path; struct status_flags { @@ -481,10 +480,7 @@ class fhandler_socket: public fhandler_base int dup (fhandler_base *child); void set_close_on_exec (bool val); - virtual void fixup_before_fork_exec (DWORD); void fixup_after_fork (HANDLE); - void fixup_after_exec (); - bool need_fixup_before () const {return true;} char *get_proc_fd_name (char *buf); select_record *select_read (select_record *s); -- cgit v1.2.3