From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 21 Apr 2025 02:02:13 +0000 (+0900)
Subject: unit-file: use STRV_FOREACH_PAIR() macro at one more place
X-Git-Tag: v258-rc1~765^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca7c4d4d89463b180100bed797bd48ddc6fe60c8;p=thirdparty%2Fsystemd.git

unit-file: use STRV_FOREACH_PAIR() macro at one more place
---

diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index e20894216b5..83a8c45032c 100644
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -838,13 +838,14 @@ const char* runlevel_to_target(const char *word) {
                 word = startswith(word, "rd.");
                 if (!word)
                         return NULL;
-        }
 
-        rlmap_ptr = in_initrd() ? rlmap_initrd : rlmap;
+                rlmap_ptr = rlmap_initrd;
+        } else
+                rlmap_ptr = rlmap;
 
-        for (size_t i = 0; rlmap_ptr[i]; i += 2)
-                if (streq(word, rlmap_ptr[i]))
-                        return rlmap_ptr[i+1];
+        STRV_FOREACH_PAIR(rl, target, rlmap_ptr)
+                if (streq(word, *rl))
+                        return *target;
 
         return NULL;
 }