[hurd,commited] hurd: Simplify usleep timeout computation

Message ID 20200629081222.924273-1-samuel.thibault@ens-lyon.org
State New
Headers show
Series
  • [hurd,commited] hurd: Simplify usleep timeout computation
Related show

Commit Message

Samuel Thibault June 29, 2020, 8:12 a.m.
as suggested by Andreas Schwab

* sysdeps/mach/usleep.c (usleep): Divide timeout in an overflow-safe way.
---
 sysdeps/mach/usleep.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

-- 
2.27.0

Patch

diff --git a/sysdeps/mach/usleep.c b/sysdeps/mach/usleep.c
index 75514b2e35..bb989e2733 100644
--- a/sysdeps/mach/usleep.c
+++ b/sysdeps/mach/usleep.c
@@ -27,16 +27,13 @@  usleep (useconds_t useconds)
 {
   mach_port_t recv;
   int cancel_oldtype;
-  useconds_t useconds_up = useconds + 999;
-
-  if (useconds_up < useconds)
-    useconds_up = UINT32_MAX;
+  mach_msg_timeout_t timeout = useconds / 1000 + (useconds % 1000 != 0);
 
   recv = __mach_reply_port ();
 
   cancel_oldtype = LIBC_CANCEL_ASYNC();
   (void) __mach_msg (NULL, MACH_RCV_MSG|MACH_RCV_TIMEOUT|MACH_RCV_INTERRUPT,
-		     0, 0, recv, useconds_up / 1000, MACH_PORT_NULL);
+		     0, 0, recv, timeout, MACH_PORT_NULL);
   LIBC_CANCEL_RESET (cancel_oldtype);
   __mach_port_destroy (mach_task_self (), recv);