From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 Apr 2023 02:18:42 +0000 (+0900)
Subject: udev/iocost: set default target in parse_config()
X-Git-Tag: v254-rc1~626^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cfe9715f5faf81244f7f7eeae35d68ad2d85816;p=thirdparty%2Fsystemd.git

udev/iocost: set default target in parse_config()

And make the failure in parsing config critical.
---

diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 54b50b4a8d5..2ded9ab9f78 100644
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -25,7 +25,9 @@ static int parse_config(void) {
         static const ConfigTableItem items[] = {
                 { "IOCost", "TargetSolution", config_parse_string, 0, &arg_target_solution },
         };
-        return config_parse(
+        int r;
+
+        r = config_parse(
                         NULL,
                         "/etc/udev/iocost.conf",
                         NULL,
@@ -35,6 +37,17 @@ static int parse_config(void) {
                         CONFIG_PARSE_WARN,
                         NULL,
                         NULL);
+        if (r < 0)
+                return r;
+
+        if (!arg_target_solution) {
+                arg_target_solution = strdup("naive");
+                if (!arg_target_solution)
+                        return log_oom();
+        }
+
+        log_debug("Target solution: %s", arg_target_solution);
+        return 0;
 }
 
 static int help(void) {
@@ -318,15 +331,9 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        (void) parse_config();
-
-        if (!arg_target_solution) {
-                arg_target_solution = strdup("naive");
-                if (!arg_target_solution)
-                        return log_oom();
-        }
-
-        log_debug("Target solution: %s.", arg_target_solution);
+        r = parse_config();
+        if (r < 0)
+                return r;
 
         return iocost_main(argc, argv);
 }