From: Douglas Christman <DouglasChristman@gmail.com>
Date: Wed, 28 Feb 2018 01:19:55 +0000 (-0500)
Subject: systemctl: remove redundant option parsing code
X-Git-Tag: v238~30^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68da321f6687235fc11ba963d0a19701d47f1261;p=thirdparty%2Fsystemd.git

systemctl: remove redundant option parsing code

"-f" used to be overloaded to mean both "--force" and "--follow";
aae9a96d removed "--follow", leaving behind some duplicate code.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3e5c7856600..e8b77d2b0b3 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7488,7 +7488,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 ARG_NO_ASK_PASSWORD,
                 ARG_FAILED,
                 ARG_RUNTIME,
-                ARG_FORCE,
                 ARG_PLAIN,
                 ARG_STATE,
                 ARG_JOB_MODE,
@@ -7528,7 +7527,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 { "dry-run",             no_argument,       NULL, ARG_DRY_RUN             },
                 { "quiet",               no_argument,       NULL, 'q'                     },
                 { "root",                required_argument, NULL, ARG_ROOT                },
-                { "force",               no_argument,       NULL, ARG_FORCE               },
+                { "force",               no_argument,       NULL, 'f'                     },
                 { "no-reload",           no_argument,       NULL, ARG_NO_RELOAD           },
                 { "kill-who",            required_argument, NULL, ARG_KILL_WHO            },
                 { "signal",              required_argument, NULL, 's'                     },
@@ -7743,10 +7742,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         arg_quiet = true;
                         break;
 
-                case ARG_FORCE:
-                        arg_force++;
-                        break;
-
                 case 'f':
                         arg_force++;
                         break;