diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-04 18:12:37 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-01-04 18:12:37 +0100 |
commit | ba5dfaef3a8eceb111a363d9505b5f12bbbf451b (patch) | |
tree | a96c5979d53962248d1591f05d19a54e28bb1d12 /hurd | |
parent | 9a079e270a9bec7e1fe28aeda63e07c1bb808d44 (diff) |
hurdselect: remove dead code.
This removes code which actually never happens, and is already taken
care of in the function.
This is in the second part of select, when the __mach_msg() function
over the portset has returned something else than MACH_MSG_SUCCESS. I
guess in the past the value returned by __mach_msg() was stored in err,
so this code was necessary to set back err to 0, but now it is stored in
msgerr, so err is already still 0 by default. It can thus never contain
MACH_RCV_TIMED_OUT, i.e. the code is dead. The first case mentioned in
the comment is already handled: on time out with no message, err is
already still the default 0. On time out due to poll, err would still be
0, unless some of the io_select RPCs has returned EINTR, in which case
it contains EINTR. If any other io_select RPCs had returned a proper
answer, got!=0, and thus err is set to 0 just below. The code is thus
indeed not useful any more.
* hurd/hurdselect.c (_hurd_select): Remove unreachable check for
MACH_RCV_TIMED_OUT.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'hurd')
-rw-r--r-- | hurd/hurdselect.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index 4544cb753b..859b351032 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -407,14 +407,6 @@ _hurd_select (int nfds, } } - if (err == MACH_RCV_TIMED_OUT) - /* This is the normal value for ERR. We might have timed out and - read no messages. Otherwise, after receiving the first message, - we poll for more messages. We receive with a timeout of 0 to - effect a poll, so ERR is MACH_RCV_TIMED_OUT when the poll finds no - message waiting. */ - err = 0; - if (got) /* At least one descriptor is known to be ready now, so we will return success. */ |