From 4947ab940491eb97842109b75ea0226f275ddbaa Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 13 Feb 2025 09:13:30 -0400 Subject: [PATCH] MT#55283 modernise timeval_add Change-Id: I16a368dc66e632d43f01f9e674ad9637a0c18370 --- daemon/call.c | 4 ++-- daemon/control_ng.c | 2 +- lib/auxlib.h | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index 049412904..4eab3e331 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -3899,10 +3899,10 @@ static struct timeval add_ongoing_calls_dur_in_interval(struct timeval *interval goto next; ml = call->monologues.head->data; if (timercmp(interval_start, &ml->started, >)) { - timeval_add(&res, &res, interval_duration); + res = timeval_add(&res, interval_duration); } else { timeval_subtract(&call_duration, &rtpe_now, &ml->started); - timeval_add(&res, &res, &call_duration); + res = timeval_add(&res, &call_duration); } next: ; diff --git a/daemon/control_ng.c b/daemon/control_ng.c index ee8eaa037..2df4d31e8 100644 --- a/daemon/control_ng.c +++ b/daemon/control_ng.c @@ -868,7 +868,7 @@ static void control_ng_process_payload(ng_ctx *hctx, str *reply, str *data, cons if (command_ctx.opmode >= 0 && command_ctx.opmode < OP_COUNT) { mutex_lock(&cur->cmd[command_ctx.opmode].lock); cur->cmd[command_ctx.opmode].count++; - timeval_add(&cur->cmd[command_ctx.opmode].time, &cur->cmd[command_ctx.opmode].time, &cmd_process_time); + cur->cmd[command_ctx.opmode].time = timeval_add(&cur->cmd[command_ctx.opmode].time, &cmd_process_time); mutex_unlock(&cur->cmd[command_ctx.opmode].lock); } diff --git a/lib/auxlib.h b/lib/auxlib.h index f454903e5..ef09817e5 100644 --- a/lib/auxlib.h +++ b/lib/auxlib.h @@ -360,8 +360,10 @@ INLINE long long timeval_diff(const struct timeval *a, const struct timeval *b) INLINE void timeval_subtract(struct timeval *result, const struct timeval *a, const struct timeval *b) { timeval_from_us(result, timeval_diff(a, b)); } -INLINE void timeval_add(struct timeval *result, const struct timeval *a, const struct timeval *b) { - timeval_from_us(result, timeval_us(a) + timeval_us(b)); +INLINE struct timeval timeval_add(const struct timeval *a, const struct timeval *b) { + struct timeval result; + timeval_from_us(&result, timeval_us(a) + timeval_us(b)); + return result; } INLINE void timeval_add_usec(struct timeval *tv, long usec) { timeval_from_us(tv, timeval_us(tv) + usec);