From: Ivan Kruglov <mail@ikruglov.com>
Date: Tue, 12 May 2026 15:50:46 +0000 (-0700)
Subject: core: use JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO() for "disabled when zero" usec fields
X-Git-Tag: v261-rc1~174^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5406d3e1e494dc2af8a0d0fba39792d20f04b18;p=thirdparty%2Fsystemd.git

core: use JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO() for "disabled when zero" usec fields

Scope: RuntimeMaxUSec, RuntimeRandomizedExtraUSec — zero means no limit
Timer: RandomizedDelayUSec, RandomizedOffsetUSec — zero means no delay
---

diff --git a/src/core/varlink-scope.c b/src/core/varlink-scope.c
index d22a2da5701..866d57db57e 100644
--- a/src/core/varlink-scope.c
+++ b/src/core/varlink-scope.c
@@ -12,8 +12,8 @@ int scope_context_build_json(sd_json_variant **ret, const char *name, void *user
         return sd_json_buildo(
                         ASSERT_PTR(ret),
                         JSON_BUILD_PAIR_ENUM("OOMPolicy", oom_policy_to_string(s->oom_policy)),
-                        JSON_BUILD_PAIR_FINITE_USEC("RuntimeMaxUSec", s->runtime_max_usec),
-                        JSON_BUILD_PAIR_FINITE_USEC("RuntimeRandomizedExtraUSec", s->runtime_rand_extra_usec),
+                        JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO("RuntimeMaxUSec", s->runtime_max_usec),
+                        JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO("RuntimeRandomizedExtraUSec", s->runtime_rand_extra_usec),
                         JSON_BUILD_PAIR_FINITE_USEC("TimeoutStopUSec", s->timeout_stop_usec));
 }
 
diff --git a/src/core/varlink-timer.c b/src/core/varlink-timer.c
index e7858fa1d25..b2d1c330360 100644
--- a/src/core/varlink-timer.c
+++ b/src/core/varlink-timer.c
@@ -56,8 +56,8 @@ int timer_context_build_json(sd_json_variant **ret, const char *name, void *user
                         SD_JSON_BUILD_PAIR_BOOLEAN("OnClockChange", t->on_clock_change),
                         SD_JSON_BUILD_PAIR_BOOLEAN("OnTimezoneChange", t->on_timezone_change),
                         JSON_BUILD_PAIR_FINITE_USEC("AccuracyUSec", t->accuracy_usec),
-                        JSON_BUILD_PAIR_FINITE_USEC("RandomizedDelayUSec", t->random_delay_usec),
-                        JSON_BUILD_PAIR_FINITE_USEC("RandomizedOffsetUSec", t->random_offset_usec),
+                        JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO("RandomizedDelayUSec", t->random_delay_usec),
+                        JSON_BUILD_PAIR_FINITE_USEC_NON_ZERO("RandomizedOffsetUSec", t->random_offset_usec),
                         SD_JSON_BUILD_PAIR_BOOLEAN("FixedRandomDelay", t->fixed_random_delay),
                         SD_JSON_BUILD_PAIR_BOOLEAN("Persistent", t->persistent),
                         SD_JSON_BUILD_PAIR_BOOLEAN("WakeSystem", t->wake_system),