JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* select.h (select_pipe_info::add_watch_handle): Delete declaration.

Browse Source 
* 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.
This commit is contained in:
Christopher Faylor 2010-04-02 15:50:54 +00:00
parent 1ae0a7c5a6
commit dffe690c84
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
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> 2010-04-02 Christopher Faylor <me+cygwin@cgf.cx>
* dtable.cc (dtable::init_std_file_from_handle): Avoid adding fh to * dtable.cc (dtable::init_std_file_from_handle): Avoid adding fh to

10
winsup/cygwin/select.cc
View File

@ -594,13 +594,6 @@ select_pipe_info::~select_pipe_info ()
ForceCloseHandle (w4[0]); 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 static DWORD WINAPI
thread_pipe (void *arg) thread_pipe (void *arg)
{ {
@ -691,7 +684,6 @@ fhandler_pipe::select_read (select_stuff *ss)
if (!ss->device_specific_pipe if (!ss->device_specific_pipe
&& (ss->device_specific_pipe = new select_pipe_info) == NULL) && (ss->device_specific_pipe = new select_pipe_info) == NULL)
return NULL; return NULL;
ss->device_specific_pipe->add_watch_handle (this);
select_record *s = ss->start.next; select_record *s = ss->start.next;
s->startup = start_thread_pipe; s->startup = start_thread_pipe;
@ -709,7 +701,6 @@ fhandler_pipe::select_write (select_stuff *ss)
if (!ss->device_specific_pipe if (!ss->device_specific_pipe
&& (ss->device_specific_pipe = new select_pipe_info) == NULL) && (ss->device_specific_pipe = new select_pipe_info) == NULL)
return NULL; return NULL;
ss->device_specific_pipe->add_watch_handle (this);
select_record *s = ss->start.next; select_record *s = ss->start.next;
s->startup = start_thread_pipe; s->startup = start_thread_pipe;
s->peek = peek_pipe; s->peek = peek_pipe;
@ -726,7 +717,6 @@ fhandler_pipe::select_except (select_stuff *ss)
if (!ss->device_specific_pipe if (!ss->device_specific_pipe
&& (ss->device_specific_pipe = new select_pipe_info) == NULL) && (ss->device_specific_pipe = new select_pipe_info) == NULL)
return NULL; return NULL;
ss->device_specific_pipe->add_watch_handle (this);
select_record *s = ss->start.next; select_record *s = ss->start.next;
s->startup = start_thread_pipe; s->startup = start_thread_pipe;
s->peek = peek_pipe; s->peek = peek_pipe;

1
winsup/cygwin/select.h
View File

@ -53,7 +53,6 @@ struct select_pipe_info: public select_info
HANDLE w4[MAXIMUM_WAIT_OBJECTS]; HANDLE w4[MAXIMUM_WAIT_OBJECTS];
select_pipe_info (); select_pipe_info ();
~select_pipe_info (); ~select_pipe_info ();
void add_watch_handle (fhandler_pipe *);
}; };
struct select_socket_info: public select_info struct select_socket_info: public select_info