From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Dec 2025 14:16:00 +0000 (+0100)
Subject: homectl: split out helper parse_nice_field
X-Git-Tag: v260-rc1~391^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c05601f40376db9fa93593bf0f4334dacf981a;p=thirdparty%2Fsystemd.git

homectl: split out helper parse_nice_field
---

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 31ec35c1493..5435e933700 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -3298,6 +3298,25 @@ static int parse_mode_field(sd_json_variant **identity, const char *field, const
         return 0;
 }
 
+static int parse_nice_field(sd_json_variant **identity, const char *field, const char *arg) {
+        int nc, r;
+
+        assert(identity);
+        assert(field);
+
+        if (isempty(arg))
+                return drop_from_identity(field);
+
+        r = parse_nice(arg, &nc);
+        if (r < 0)
+                return log_error_errno(r, "Failed to parse nice level '%s': %m", arg);
+
+        r = sd_json_variant_set_field_integer(identity, field, nc);
+        if (r < 0)
+                return log_error_errno(r, "Failed to set %s field: %m", field);
+        return 0;
+}
+
 static int help(int argc, char *argv[], void *userdata) {
         _cleanup_free_ char *link = NULL;
         int r;
@@ -3905,26 +3924,11 @@ static int parse_argv(int argc, char *argv[]) {
                         string_erase(optarg);
                         break;
 
-                case ARG_NICE: {
-                        int nc;
-
-                        if (isempty(optarg)) {
-                                r = drop_from_identity("niceLevel");
-                                if (r < 0)
-                                        return r;
-                                break;
-                        }
-
-                        r = parse_nice(optarg, &nc);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to parse nice level: %s", optarg);
-
-                        r = sd_json_variant_set_field_integer(match_identity ?: &arg_identity_extra, "niceLevel", nc);
+                case ARG_NICE:
+                        r = parse_nice_field(match_identity ?: &arg_identity_extra, "niceLevel", optarg);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to set niceLevel field: %m");
-
+                                return r;
                         break;
-                }
 
                 case ARG_RLIMIT: {
                         _cleanup_(sd_json_variant_unrefp) sd_json_variant *jcur = NULL, *jmax = NULL;