* fhandler.cc (fhandler_base::read): Remove unused signal state tweaks.
* fhandler.h (fhandler_pipe::create_selectable): Declare. (fhandler_fifo::close_one_end): Declare. * fhandler_fifo.cc (fhandler_fifo::close_one_end): Define. (fhandler_fifo::open_not_mine): Use close_one_end to close appropriate end of pipe. * pinfo.cc (_pinfo::commune_recv): Ditto. * pipe.cc (fhandler_pipe::create_selectable): Rename from create_selectable_pipe. Reorganize. (fhandler_pipe::create): Use create_selectable.
This commit is contained in:
@ -699,7 +699,6 @@ fhandler_base::read (void *in_ptr, size_t& len)
|
||||
{
|
||||
char *ptr = (char *) in_ptr;
|
||||
ssize_t copied_chars = 0;
|
||||
bool need_signal = !!read_state;
|
||||
int c;
|
||||
|
||||
while (len)
|
||||
@ -723,7 +722,6 @@ fhandler_base::read (void *in_ptr, size_t& len)
|
||||
goto out;
|
||||
}
|
||||
|
||||
need_signal = false;
|
||||
raw_read (ptr + copied_chars, len);
|
||||
if (!copied_chars)
|
||||
/* nothing */;
|
||||
@ -792,9 +790,6 @@ fhandler_base::read (void *in_ptr, size_t& len)
|
||||
#endif
|
||||
|
||||
out:
|
||||
if (need_signal)
|
||||
signal_read_state (2);
|
||||
|
||||
debug_printf ("returning %d, %s mode", len, rbinary () ? "binary" : "text");
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user