Cygwin: FIFO: code simplification: don't overload get_handle
Rename fhandler_fifo::get_handle(int) to get_fc_handle(int), and remove fhandler_fifo::get_handle(void).
This commit is contained in:
parent
10bf30bebf
commit
d243b3c70e
|
@ -1284,9 +1284,10 @@ public:
|
||||||
fhandler_fifo ();
|
fhandler_fifo ();
|
||||||
bool hit_eof ();
|
bool hit_eof ();
|
||||||
int get_nhandlers () const { return nhandlers; }
|
int get_nhandlers () const { return nhandlers; }
|
||||||
HANDLE& get_handle () { return fhandler_base::get_handle (); }
|
HANDLE get_fc_handle (int i) const
|
||||||
HANDLE get_handle (int i) const { return fc_handler[i].fh->get_handle (); }
|
{ return fc_handler[i].fh->get_handle (); }
|
||||||
bool is_connected (int i) const { return fc_handler[i].state == fc_connected; }
|
bool is_connected (int i) const
|
||||||
|
{ return fc_handler[i].state == fc_connected; }
|
||||||
PUNICODE_STRING get_pipe_name ();
|
PUNICODE_STRING get_pipe_name ();
|
||||||
DWORD listen_client_thread ();
|
DWORD listen_client_thread ();
|
||||||
void fifo_client_lock () { _fifo_client_lock.lock (); }
|
void fifo_client_lock () { _fifo_client_lock.lock (); }
|
||||||
|
|
|
@ -875,7 +875,7 @@ peek_fifo (select_record *s, bool from_select)
|
||||||
for (int i = 0; i < fh->get_nhandlers (); i++)
|
for (int i = 0; i < fh->get_nhandlers (); i++)
|
||||||
if (fh->is_connected (i))
|
if (fh->is_connected (i))
|
||||||
{
|
{
|
||||||
int n = pipe_data_available (s->fd, fh, fh->get_handle (i),
|
int n = pipe_data_available (s->fd, fh, fh->get_fc_handle (i),
|
||||||
false);
|
false);
|
||||||
if (n > 0)
|
if (n > 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue