diff options
| author | Christopher Faylor <me@cgf.cx> | 2010-04-02 15:50:54 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2010-04-02 15:50:54 +0000 |
| commit | dffe690c8477631928917618ec39632fabd2ba62 (patch) | |
| tree | d6029e1973502c8a7dc510b0c4bd65a1e08b38c7 /winsup | |
| parent | 1ae0a7c5a61ae4dd7b2d9efe41ac603f073d4576 (diff) | |
| download | newlib-dffe690c8477631928917618ec39632fabd2ba62.zip newlib-dffe690c8477631928917618ec39632fabd2ba62.tar.gz newlib-dffe690c8477631928917618ec39632fabd2ba62.tar.bz2 | |
* select.h (select_pipe_info::add_watch_handle): Delete declaration.
* select.cc (select_pipe_info::add_watch_handle): Delete deinition.
(fhandler_pipe::select_read): Delete call to add_watch_handle.
(fhandler_pipe::select_write): Ditto.
(fhandler_pipe::select_except): Ditto.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/select.cc | 10 | ||||
| -rw-r--r-- | winsup/cygwin/select.h | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index a932912..c3f02a0 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,13 @@ 2010-04-02 Christopher Faylor <me+cygwin@cgf.cx> + * select.h (select_pipe_info::add_watch_handle): Delete declaration. + * select.cc (select_pipe_info::add_watch_handle): Delete deinition. + (fhandler_pipe::select_read): Delete call to add_watch_handle. + (fhandler_pipe::select_write): Ditto. + (fhandler_pipe::select_except): Ditto. + +2010-04-02 Christopher Faylor <me+cygwin@cgf.cx> + * dtable.cc (dtable::init_std_file_from_handle): Avoid adding fh to fdtab until we know that it is good. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Handle diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 1a07e7b..4fd8861 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -594,13 +594,6 @@ select_pipe_info::~select_pipe_info () ForceCloseHandle (w4[0]); } -void -select_pipe_info::add_watch_handle (fhandler_pipe *fh) -{ - if (fh->io_pending && fh->get_overlapped () && fh->get_overlapped ()->hEvent) - w4[n++] = fh->get_overlapped ()->hEvent; -} - static DWORD WINAPI thread_pipe (void *arg) { @@ -691,7 +684,6 @@ fhandler_pipe::select_read (select_stuff *ss) if (!ss->device_specific_pipe && (ss->device_specific_pipe = new select_pipe_info) == NULL) return NULL; - ss->device_specific_pipe->add_watch_handle (this); select_record *s = ss->start.next; s->startup = start_thread_pipe; @@ -709,7 +701,6 @@ fhandler_pipe::select_write (select_stuff *ss) if (!ss->device_specific_pipe && (ss->device_specific_pipe = new select_pipe_info) == NULL) return NULL; - ss->device_specific_pipe->add_watch_handle (this); select_record *s = ss->start.next; s->startup = start_thread_pipe; s->peek = peek_pipe; @@ -726,7 +717,6 @@ fhandler_pipe::select_except (select_stuff *ss) if (!ss->device_specific_pipe && (ss->device_specific_pipe = new select_pipe_info) == NULL) return NULL; - ss->device_specific_pipe->add_watch_handle (this); select_record *s = ss->start.next; s->startup = start_thread_pipe; s->peek = peek_pipe; diff --git a/winsup/cygwin/select.h b/winsup/cygwin/select.h index 743222e..3d553eb 100644 --- a/winsup/cygwin/select.h +++ b/winsup/cygwin/select.h @@ -53,7 +53,6 @@ struct select_pipe_info: public select_info HANDLE w4[MAXIMUM_WAIT_OBJECTS]; select_pipe_info (); ~select_pipe_info (); - void add_watch_handle (fhandler_pipe *); }; struct select_socket_info: public select_info |