From 0fc0f906e12c724a7793c37be9559b9b88a13b70 Mon Sep 17 00:00:00 2001 From: Bryan Christianson Date: Thu, 23 Jul 2015 23:59:31 +1200 Subject: [PATCH] util: fix rounding of negative numbers in UTI_DoubleToTimeval() --- util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/util.c b/util.c index 0ebebff..e89b5f3 100644 --- a/util.c +++ b/util.c @@ -46,11 +46,13 @@ UTI_TimevalToDouble(struct timeval *a, double *b) INLINE_STATIC void UTI_DoubleToTimeval(double a, struct timeval *b) { - long int_part, frac_part; + long int_part; + double frac_part; int_part = (long)(a); - frac_part = (long)(0.5 + 1.0e6 * (a - (double)(int_part))); + frac_part = 1.0e6 * (a - (double)(int_part)); + frac_part = frac_part > 0 ? frac_part + 0.5 : frac_part - 0.5; b->tv_sec = int_part; - b->tv_usec = frac_part; + b->tv_usec = (long)frac_part; UTI_NormaliseTimeval(b); }