From c187253fc222ed05de710d94b5bcaf02c3ef37c5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 7 Feb 2015 22:18:03 +0100 Subject: 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. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 97849df706..4ba04cdd86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ 45. * hurd/hurdselect.c (_hurd_select): Pass MACH_RCV_INTERRUPT to __mach_msg. If that returns MACH_RCV_INTERRUPTED, set ERR to EINTR. + * hurd/hurdselect.c (_hurd_select): Remove unreachable check for + MACH_RCV_TIMED_OUT. 2015-02-06 Roland McGrath -- cgit v1.2.3