diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-04 19:39:04 +0200 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-04-05 13:06:26 +0800 |
| commit | 51214cf49195b645bd58b0c41046470908de71d9 (patch) | |
| tree | 458ded0c5ca7807fe2bd38de631756784bcbd97a /src/ask-password | |
| parent | 96181b7a893da444fa9adcd1e7c95769d97c2a95 (diff) | |
| download | systemd-51214cf49195b645bd58b0c41046470908de71d9.tar.gz | |
various: simplify calls to parse_boolean_argument()
parse_boolean_argument() returns the same information via both the output
argument and normal return.
Diffstat (limited to 'src/ask-password')
| -rw-r--r-- | src/ask-password/ask-password.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index f161e65973..c02e3b42fe 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -138,14 +138,12 @@ static int parse_argv(int argc, char *argv[]) { /* Empty argument or explicit string "masked" for default behaviour. */ arg_flags &= ~(ASK_PASSWORD_ECHO|ASK_PASSWORD_SILENT); else { - bool b; - - r = parse_boolean_argument("--echo=", optarg, &b); + r = parse_boolean_argument("--echo=", optarg, NULL); if (r < 0) return r; - SET_FLAG(arg_flags, ASK_PASSWORD_ECHO, b); - SET_FLAG(arg_flags, ASK_PASSWORD_SILENT, !b); + SET_FLAG(arg_flags, ASK_PASSWORD_ECHO, r); + SET_FLAG(arg_flags, ASK_PASSWORD_SILENT, !r); } break; @@ -195,13 +193,11 @@ static int parse_argv(int argc, char *argv[]) { if (isempty(emoji) || streq(emoji, "auto")) SET_FLAG(arg_flags, ASK_PASSWORD_HIDE_EMOJI, FLAGS_SET(arg_flags, ASK_PASSWORD_ECHO)); else { - bool b; - - r = parse_boolean_argument("--emoji=", emoji, &b); + r = parse_boolean_argument("--emoji=", emoji, NULL); if (r < 0) return r; - SET_FLAG(arg_flags, ASK_PASSWORD_HIDE_EMOJI, !b); + SET_FLAG(arg_flags, ASK_PASSWORD_HIDE_EMOJI, !r); } if (argc > optind) { |