From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 27 Jun 2025 14:16:04 +0000 (+0200)
Subject: shared/bus-unit-util: add helper for TimersCalendar property
X-Git-Tag: v258-rc1~183^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfa7d82661a3114b8aace3893b3993c40b0129f7;p=thirdparty%2Fsystemd.git

shared/bus-unit-util: add helper for TimersCalendar property
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 424218692f2..1cd10632226 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2203,6 +2203,19 @@ static int bus_append_timers_monotonic(sd_bus_message *m, const char *field, con
         return 1;
 }
 
+static int bus_append_timers_calendar(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
+
+        if (isempty(eq))
+                r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 0);
+        else
+                r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 1, field, eq);
+        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",
@@ -2827,8 +2840,6 @@ static int bus_append_socket_property(sd_bus_message *m, const char *field, cons
         return 0;
 }
 static int bus_append_timer_property(sd_bus_message *m, const char *field, const char *eq) {
-        int r;
-
         if (STR_IN_SET(field, "WakeSystem",
                               "RemainAfterElapse",
                               "Persistent",
@@ -2850,16 +2861,8 @@ static int bus_append_timer_property(sd_bus_message *m, const char *field, const
                               "OnUnitInactiveSec"))
                 return bus_append_timers_monotonic(m, field, eq);
 
-        if (streq(field, "OnCalendar")) {
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 0);
-                else
-                        r = sd_bus_message_append(m, "(sv)", "TimersCalendar", "a(ss)", 1, field, eq);
-                if (r < 0)
-                        return bus_log_create_error(r);
-
-                return 1;
-        }
+        if (streq(field, "OnCalendar"))
+                return bus_append_timers_calendar(m, field, eq);
 
         return 0;
 }