|
 |
2aacef |
From bca4fe362cb2198f964d33c5a0fb27298d8e9ad8 Mon Sep 17 00:00:00 2001
|
|
|
2aacef |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
2aacef |
Date: Mon, 21 Nov 2022 20:03:08 +0100
|
|
|
2aacef |
Subject: [PATCH] manager: fix format strings for trigger metadata
|
|
|
2aacef |
|
|
|
2aacef |
Fixup for c8bc7519c888a99134f88f8c82353246d3c0cc5d.
|
|
|
2aacef |
|
|
|
2aacef |
(cherry picked from commit 6457ce15be84cf3c304d1ba47b89bacc2f60bf6e)
|
|
|
2aacef |
|
|
|
2aacef |
Related: #2138081
|
|
|
2aacef |
---
|
|
|
2aacef |
src/core/timer.c | 8 ++++----
|
|
|
2aacef |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
2aacef |
|
|
|
2aacef |
diff --git a/src/core/timer.c b/src/core/timer.c
|
|
|
2aacef |
index 8bd430b931..b6810c8599 100644
|
|
|
2aacef |
--- a/src/core/timer.c
|
|
|
2aacef |
+++ b/src/core/timer.c
|
|
|
2aacef |
@@ -948,11 +948,11 @@ static int activation_details_timer_append_env(ActivationDetails *details, char
|
|
|
2aacef |
if (!dual_timestamp_is_set(&t->last_trigger))
|
|
|
2aacef |
return 0;
|
|
|
2aacef |
|
|
|
2aacef |
- r = strv_extendf(strv, "TRIGGER_TIMER_REALTIME_USEC=%" USEC_FMT, t->last_trigger.realtime);
|
|
|
2aacef |
+ r = strv_extendf(strv, "TRIGGER_TIMER_REALTIME_USEC=" USEC_FMT, t->last_trigger.realtime);
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|
|
|
2aacef |
- r = strv_extendf(strv, "TRIGGER_TIMER_MONOTONIC_USEC=%" USEC_FMT, t->last_trigger.monotonic);
|
|
|
2aacef |
+ r = strv_extendf(strv, "TRIGGER_TIMER_MONOTONIC_USEC=" USEC_FMT, t->last_trigger.monotonic);
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|
|
|
2aacef |
@@ -974,7 +974,7 @@ static int activation_details_timer_append_pair(ActivationDetails *details, char
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|
|
|
2aacef |
- r = strv_extendf(strv, "%" USEC_FMT, t->last_trigger.realtime);
|
|
|
2aacef |
+ r = strv_extendf(strv, USEC_FMT, t->last_trigger.realtime);
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|
|
|
2aacef |
@@ -982,7 +982,7 @@ static int activation_details_timer_append_pair(ActivationDetails *details, char
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|
|
|
2aacef |
- r = strv_extendf(strv, "%" USEC_FMT, t->last_trigger.monotonic);
|
|
|
2aacef |
+ r = strv_extendf(strv, USEC_FMT, t->last_trigger.monotonic);
|
|
|
2aacef |
if (r < 0)
|
|
|
2aacef |
return r;
|
|
|
2aacef |
|