From: David Tardon <dtardon@redhat.com>
Date: Wed, 1 Oct 2025 17:27:23 +0000 (+0200)
Subject: nspawn: inline handle_arg_console() to its only call place
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=365399c4e4c7ee8ade764dfe479946764d6b5f4d;p=thirdparty%2Fsystemd.git

nspawn: inline handle_arg_console() to its only call place
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 0b01dbc450e..c13077c328c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -286,18 +286,6 @@ STATIC_DESTRUCTOR_REGISTER(arg_settings_filename, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_background, freep);
 
-static int handle_arg_console(const char *arg) {
-        if (streq(arg, "help"))
-                return DUMP_STRING_TABLE(console_mode, ConsoleMode, _CONSOLE_MODE_MAX);
-
-        arg_console_mode = console_mode_from_string(optarg);
-        if (arg_console_mode < 0)
-                return log_error_errno(arg_console_mode, "Unknown console mode: %s", optarg);
-
-        arg_settings_mask |= SETTING_CONSOLE_MODE;
-        return 1;
-}
-
 static int help(void) {
         _cleanup_free_ char *link = NULL;
         int r;
@@ -1471,9 +1459,15 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_CONSOLE:
-                        r = handle_arg_console(optarg);
-                        if (r <= 0)
-                                return r;
+                        if (streq(optarg, "help"))
+                                return DUMP_STRING_TABLE(console_mode, ConsoleMode, _CONSOLE_MODE_MAX);
+
+                        arg_console_mode = console_mode_from_string(optarg);
+                        if (arg_console_mode < 0)
+                                return log_error_errno(arg_console_mode, "Unknown console mode: %s", optarg);
+
+                        arg_settings_mask |= SETTING_CONSOLE_MODE;
+
                         break;
 
                 case 'P':