MT#55283 modernise timeval_add

Change-Id: I16a368dc66e632d43f01f9e674ad9637a0c18370

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:
 		;

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);
 	}
 

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);