dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 09:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: remove redundant option parsing code

Browse Source 
"-f" used to be overloaded to mean both "--force" and "--follow";
aae9a96d removed "--follow", leaving behind some duplicate code.
This commit is contained in:
Douglas Christman
2018-02-27 20:19:55 -05:00
parent 2de6b06b27
commit 68da321f66
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/systemctl/systemctl.c
View File

@@ -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;