From 74c7c57c678167639cad0de3fdf1eaa2cecfc2f8 Mon Sep 17 00:00:00 2001 From: Andrei Tatar Date: Tue, 7 Nov 2023 14:59:41 +0100 Subject: [PATCH] include/arch: Make time constants signed This change removes the unsigned marker on integer literals that define time-related constants, as there is no logical reason for time to always be positive. This also alleviates mixed-signedness warnings when doing arithmetic on time values, as well as assigning to __snsec. Signed-off-by: Andrei Tatar Reviewed-by: Simon Kuenzer Approved-by: Simon Kuenzer GitHub-Closes: #1157 --- include/uk/arch/time.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/uk/arch/time.h b/include/uk/arch/time.h index e815e790f..dd79ff8d8 100644 --- a/include/uk/arch/time.h +++ b/include/uk/arch/time.h @@ -55,15 +55,15 @@ typedef __s64 __snsec; #define __SNSEC_MAX (__S64_MAX) #define __SNSEC_MIN (__S64_MIN) -#define UKARCH_NSEC_PER_SEC ((__nsec)1000000000ULL) +#define UKARCH_NSEC_PER_SEC ((__snsec)1000000000LL) #define ukarch_time_nsec_to_sec(ns) ((ns) / UKARCH_NSEC_PER_SEC) -#define ukarch_time_nsec_to_msec(ns) ((ns) / 1000000UL) -#define ukarch_time_nsec_to_usec(ns) ((ns) / 1000UL) -#define ukarch_time_subsec(ns) ((ns) % ((__nsec)1000000000ULL)) +#define ukarch_time_nsec_to_msec(ns) ((ns) / 1000000L) +#define ukarch_time_nsec_to_usec(ns) ((ns) / 1000L) +#define ukarch_time_subsec(ns) ((ns) % UKARCH_NSEC_PER_SEC) #define ukarch_time_sec_to_nsec(sec) ((sec) * UKARCH_NSEC_PER_SEC) -#define ukarch_time_msec_to_nsec(msec) ((msec) * 1000000UL) -#define ukarch_time_usec_to_nsec(usec) ((usec) * 1000UL) +#define ukarch_time_msec_to_nsec(msec) ((msec) * 1000000L) +#define ukarch_time_usec_to_nsec(usec) ((usec) * 1000L) #endif /* __UKARCH_TIME_H__ */ -- 2.39.5