From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 23 May 2025 14:24:27 +0000 (+0900)
Subject: hostname: use FOREACH_ARGUMENT() at one more place
X-Git-Tag: v258-rc1~509^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dda0e5aa9558747f5ceb01f0c2857088175a0376;p=thirdparty%2Fsystemd.git

hostname: use FOREACH_ARGUMENT() at one more place

Follow-up for 29a352e8c14c51983ba661cb5f4ce51e2bc8664b.
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ec09acb539d..e194381ce1b 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -393,17 +393,16 @@ static int get_hardware_version(Context *c, char **ret) {
 
         /* Suppress reporting the version field, if it's the same string as the
          * model or sku field, which it appears to be on various systems */
-        for (int i = 0; i < 2; i++) {
+        int (*getter)(Context *c, char **ret);
+        FOREACH_ARGUMENT(getter, get_hardware_model, get_hardware_sku) {
                 _cleanup_free_ char *value = NULL;
 
-                if (i == 0)
-                        r = get_hardware_model(c, &value);
-                else
-                        r = get_hardware_sku(c, &value);
-                if (r < 0) {
-                        if (r != -ENOENT)
-                                return r;
-                } else if (streq_ptr(version, value))
+                r = getter(c, &value);
+                if (r == -ENOENT)
+                        continue;
+                if (r < 0)
+                        return r;
+                if (streq_ptr(version, value))
                         return -ENOENT;
         }