From 192f6ea7581856fb124c949d708ee534a055dcb7 Mon Sep 17 00:00:00 2001 From: Dirk Chang Date: Fri, 5 Mar 2021 15:53:33 +0800 Subject: [PATCH] Fixed siridb_time_now returns incorrect number in arm32 build --- src/siri/db/query.c | 4 ++-- src/siri/db/time.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/siri/db/query.c b/src/siri/db/query.c index 941614a7..373046c1 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -896,7 +896,7 @@ static int QUERY_time_expr( *size, "%" PRIu64, siridb_time_parse(node->str, node->len) * - walker->siridb->time->factor); + (uint64_t)walker->siridb->time->factor); if (n >= (ssize_t) *size) { return EXPR_TOO_LONG; @@ -930,7 +930,7 @@ static int QUERY_time_expr( buf + EXPR_MAX_SIZE - *size, *size, "%" PRId64, - ts * walker->siridb->time->factor); + ts * (uint64_t)walker->siridb->time->factor); if (n >= (ssize_t) *size) { diff --git a/src/siri/db/time.c b/src/siri/db/time.c index fb4f26da..a94f5ca9 100644 --- a/src/siri/db/time.c +++ b/src/siri/db/time.c @@ -60,6 +60,6 @@ uint32_t siridb_time_in_seconds(siridb_t * siridb, int64_t ts) uint64_t siridb_time_now(siridb_t * siridb, struct timespec now) { - return now.tv_sec * siridb->time->factor + - now.tv_nsec * (siridb->time->factor / 1000000000.0); + return now.tv_sec * (uint64_t)siridb->time->factor + + now.tv_nsec * ((uint64_t)siridb->time->factor / 1000000000.0); }