From 166201d9fca04736c7843fa61a597ac6d12e4e7d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sun, 22 Mar 2026 18:24:16 +1000 Subject: [PATCH] util: fix remaininig usec computation on 32 bits Follow-up from commit dcbfbc4cf1c0 ("util: fix usec computation on 32 bits") which didn't fix all instances, make this consistent. Fixes: dcbfbc4cf1c0 ("util: fix usec computation on 32 bits") Part-of: --- src/util-time.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util-time.h b/src/util-time.h index a3a5baf3..fe2ca1d8 100644 --- a/src/util-time.h +++ b/src/util-time.h @@ -47,13 +47,13 @@ usec_from_millis(uint32_t millis) static inline usec_t usec_from_seconds(uint32_t secs) { - return usec_from_millis(secs * 1000); + return usec_from_uint64_t(secs * 1000000ULL); } static inline usec_t usec_from_hours(uint32_t hours) { - return usec_from_seconds(hours * 3600); + return usec_from_uint64_t((uint64_t)hours * 3600 * 1000000ULL); } static inline uint32_t @@ -83,7 +83,7 @@ usec_to_hours(usec_t us) static inline usec_t usec_add_millis(usec_t us, uint32_t millis) { - return usec_from_uint64_t(usec_as_uint64_t(us) + millis * 1000); + return usec_from_uint64_t(usec_as_uint64_t(us) + millis * 1000ULL); } static inline usec_t