From b79f85c28b63ccc3326ac78654c8171c3f8a5706 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 9 Apr 2004 08:43:29 +0000 Subject: * fhandler.cc (fhandler_base::write): Use bool parameter in calls to set_did_lseek. (fhandler_base::fhandler_base): Accomodate new status and open_status constructor. * fhandler.h: Remove status bit enumerator. (FHDEVN): Remove. (FHISSETF): Remove. (FHSETF): Remove. (FHCLEARF): Remove. (FHCONDSETF): Remove. (FHSTATOFF): Remove. (UNCONNECTED, CONNECT_PENDING, CONNECTED): Substitute by enum connect_state. (fhandler_base::status): Define as bitfield struct type status_flags. Remove unused flags entirely. Accomodate all status access methods. (open_status): Define as bitfield struct type status_flags. (fhandler_socket): Move socket related status bits to here. Redefine had_connect_or_listen to be part of these status bits. Accomodate related access methods. * fhandler_disk_file.cc (fhandler_base::fstat_helper): Use pc.issymlink instead of dropped method get_symlink_p. (fhandler_base::open_fs): Remove setting dropped status flags. * fhandler_socket.cc: Use values from enum connect_state throughout. (fhandler_socket::fhandler_socket): Initialize status bits. * fhandler_virtual.cc (fhandler_virtual::open): Remove setting dropped status flags. * net.cc: Use values from enum connect_state throughout. * select.cc: Ditto. * shared_info.h: Protect struct console_state using _FHANDLER_H_ instead of FHDEVN. --- winsup/cygwin/select.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/select.cc') diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index d16d03b94..35ae6522c 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -335,7 +335,7 @@ set_bits (select_record *me, fd_set *readfds, fd_set *writefds, { UNIX_FD_SET (me->fd, writefds); if (me->except_on_write && me->fh->is_socket ()) - ((fhandler_socket *) me->fh)->set_connect_state (CONNECTED); + ((fhandler_socket *) me->fh)->set_connect_state (connected); ready++; } if ((me->except_selected || me->except_on_write) && me->except_ready) @@ -344,7 +344,7 @@ set_bits (select_record *me, fd_set *readfds, fd_set *writefds, { UNIX_FD_SET (me->fd, writefds); if (me->fh->is_socket ()) - ((fhandler_socket *) me->fh)->set_connect_state (CONNECTED); + ((fhandler_socket *) me->fh)->set_connect_state (connected); } if (me->except_selected) UNIX_FD_SET (me->fd, exceptfds); -- cgit v1.2.3