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/home | |
| 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/home')
| -rw-r--r-- | src/home/homectl.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/home/homectl.c b/src/home/homectl.c index 158164ae81..b265f8741e 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -3576,38 +3576,29 @@ static int parse_argv(int argc, char *argv[]) { strv_uniq(arg_fido2_device); break; - case ARG_FIDO2_WITH_PIN: { - bool lock_with_pin; - - r = parse_boolean_argument("--fido2-with-client-pin=", optarg, &lock_with_pin); + case ARG_FIDO2_WITH_PIN: + r = parse_boolean_argument("--fido2-with-client-pin=", optarg, NULL); if (r < 0) return r; - SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_PIN, lock_with_pin); + SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_PIN, r); break; - } - case ARG_FIDO2_WITH_UP: { - bool lock_with_up; - - r = parse_boolean_argument("--fido2-with-user-presence=", optarg, &lock_with_up); + case ARG_FIDO2_WITH_UP: + r = parse_boolean_argument("--fido2-with-user-presence=", optarg, NULL); if (r < 0) return r; - SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_UP, lock_with_up); + SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_UP, r); break; - } - case ARG_FIDO2_WITH_UV: { - bool lock_with_uv; - - r = parse_boolean_argument("--fido2-with-user-verification=", optarg, &lock_with_uv); + case ARG_FIDO2_WITH_UV: + r = parse_boolean_argument("--fido2-with-user-verification=", optarg, NULL); if (r < 0) return r; - SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_UV, lock_with_uv); + SET_FLAG(arg_fido2_lock_with, FIDO2ENROLL_UV, r); break; - } case ARG_RECOVERY_KEY: r = parse_boolean(optarg); @@ -3727,8 +3718,6 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_DROP_CACHES: { - bool drop_caches; - if (isempty(optarg)) { r = drop_from_identity("dropCaches"); if (r < 0) @@ -3736,7 +3725,7 @@ static int parse_argv(int argc, char *argv[]) { break; } - r = parse_boolean_argument("--drop-caches=", optarg, &drop_caches); + r = parse_boolean_argument("--drop-caches=", optarg, NULL); if (r < 0) return r; |