From 68da321f6687235fc11ba963d0a19701d47f1261 Mon Sep 17 00:00:00 2001 From: Douglas Christman Date: Tue, 27 Feb 2018 20:19:55 -0500 Subject: [PATCH] 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. --- src/systemctl/systemctl.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 3e5c785660..e8b77d2b0b 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; -- 2.25.1