hrev47868 adds 1 changeset to branch 'master' old head: 7603710e9adfc60102336b3450fd8d497f372ff8 new head: c8990b0907d8dcf5f282e8c23a58d7466dbc25cc overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c8990b0+%5E7603710 ---------------------------------------------------------------------------- c8990b0: _user_wait_for_objects: remove redundant check. [ Jérôme Duval <jerome.duval@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev47868 Commit: c8990b0907d8dcf5f282e8c23a58d7466dbc25cc URL: http://cgit.haiku-os.org/haiku/commit/?id=c8990b0 Author: Jérôme Duval <jerome.duval@xxxxxxxxx> Date: Wed Sep 17 19:03:36 2014 UTC ---------------------------------------------------------------------------- 1 file changed, 2 insertions(+), 2 deletions(-) src/system/kernel/wait_for_objects.cpp | 4 ++-- ---------------------------------------------------------------------------- diff --git a/src/system/kernel/wait_for_objects.cpp b/src/system/kernel/wait_for_objects.cpp index 418a734..4fab084 100644 --- a/src/system/kernel/wait_for_objects.cpp +++ b/src/system/kernel/wait_for_objects.cpp @@ -1072,8 +1072,7 @@ _user_wait_for_objects(object_wait_info* userInfos, int numInfos, uint32 flags, false); if (result >= 0 && user_memcpy(userInfos, infos, bytes) != B_OK) { - if (result >= 0) - result = B_BAD_ADDRESS; + result = B_BAD_ADDRESS; } else syscall_restart_handle_timeout_post(result, timeout); } else @@ -1083,3 +1082,4 @@ _user_wait_for_objects(object_wait_info* userInfos, int numInfos, uint32 flags, return result; } +