From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 17 Nov 2023 16:55:35 +0000 (+0100)
Subject: core: use uniform style for RateLimit initialization
X-Git-Tag: v255-rc3~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fed25720efa0fb0b94a0b13a7bf2b1df971280e2;p=thirdparty%2Fsystemd.git

core: use uniform style for RateLimit initialization

RateLimit is designed so that we can always initialize only the first two
fields explicitly. All other call sites use a single line for this.
---

diff --git a/src/basic/ratelimit.h b/src/basic/ratelimit.h
index bb7160a895b..492ea3b48dd 100644
--- a/src/basic/ratelimit.h
+++ b/src/basic/ratelimit.h
@@ -12,6 +12,8 @@ typedef struct RateLimit {
         usec_t begin;
 } RateLimit;
 
+#define RATELIMIT_OFF (const RateLimit) { .interval = USEC_INFINITY, .burst = UINT_MAX }
+
 static inline void ratelimit_reset(RateLimit *rl) {
         rl->num = rl->begin = 0;
 }
diff --git a/src/core/manager.c b/src/core/manager.c
index fcb7739b136..57ec5f38609 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -927,10 +927,7 @@ int manager_new(RuntimeScope runtime_scope, ManagerTestRunFlags test_run_flags,
                 .first_boot = -1,
                 .test_run_flags = test_run_flags,
 
-                .dump_ratelimit = {
-                        .interval = 10 * USEC_PER_MINUTE,
-                        .burst = 10,
-                },
+                .dump_ratelimit = (const RateLimit) { .interval = 10 * USEC_PER_MINUTE, .burst = 10 },
 
                 .executor_fd = -EBADF,
         };
diff --git a/src/core/path.c b/src/core/path.c
index 3ffa0acc625..c09f001d50a 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -279,8 +279,7 @@ static void path_init(Unit *u) {
 
         p->directory_mode = 0755;
 
-        p->trigger_limit.interval = USEC_INFINITY;
-        p->trigger_limit.burst = UINT_MAX;
+        p->trigger_limit = RATELIMIT_OFF;
 }
 
 void path_free_specs(Path *p) {
diff --git a/src/core/socket.c b/src/core/socket.c
index 156ac4a2d59..cb28c788407 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -100,8 +100,7 @@ static void socket_init(Unit *u) {
         s->control_pid = PIDREF_NULL;
         s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
 
-        s->trigger_limit.interval = USEC_INFINITY;
-        s->trigger_limit.burst = UINT_MAX;
+        s->trigger_limit = RATELIMIT_OFF;
 
         s->poll_limit_interval = USEC_INFINITY;
         s->poll_limit_burst = UINT_MAX;
diff --git a/src/core/unit.c b/src/core/unit.c
index b37b1710f26..41f3bdb226a 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -132,15 +132,12 @@ Unit* unit_new(Manager *m, size_t size) {
 
         u->last_section_private = -1;
 
-        u->start_ratelimit = (RateLimit) {
+        u->start_ratelimit = (const RateLimit) {
                 m->defaults.start_limit_interval,
-                m->defaults.start_limit_burst
+                m->defaults.start_limit_burst,
         };
 
-        u->auto_start_stop_ratelimit = (const RateLimit) {
-                10 * USEC_PER_SEC,
-                16
-        };
+        u->auto_start_stop_ratelimit = (const RateLimit) { .interval = 10 * USEC_PER_SEC, .burst = 16 };
 
         return u;
 }