From c3c21b2bc4f5b1827957ad8d0f4fd5b1704026f4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 27 Jun 2025 16:14:44 +0200
Subject: [PATCH] shared/bus-unit-util: add helper for TimersMonotonic property

---
 src/shared/bus-unit-util.c | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 62df0f5e36d..424218692f2 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2184,6 +2184,25 @@ static int bus_append_listen(sd_bus_message *m, const char *field, const char *e
         return 1;
 }
 
+static int bus_append_timers_monotonic(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
+
+        if (isempty(eq))
+                r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 0);
+        else {
+                usec_t t;
+                r = parse_sec(eq, &t);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq);
+
+                r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 1, field, t);
+        }
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
 static int bus_append_cgroup_property(sd_bus_message *m, const char *field, const char *eq) {
         if (STR_IN_SET(field, "DevicePolicy",
                               "Slice",
@@ -2828,22 +2847,8 @@ static int bus_append_timer_property(sd_bus_message *m, const char *field, const
                               "OnBootSec",
                               "OnStartupSec",
                               "OnUnitActiveSec",
-                              "OnUnitInactiveSec")) {
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 0);
-                else {
-                        usec_t t;
-                        r = parse_sec(eq, &t);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse %s=%s: %m", field, eq);
-
-                        r = sd_bus_message_append(m, "(sv)", "TimersMonotonic", "a(st)", 1, field, t);
-                }
-                if (r < 0)
-                        return bus_log_create_error(r);
-
-                return 1;
-        }
+                              "OnUnitInactiveSec"))
+                return bus_append_timers_monotonic(m, field, eq);
 
         if (streq(field, "OnCalendar")) {
                 if (isempty(eq))
-- 
2.47.3