diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-16 14:32:23 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-19 00:33:33 +0100 |
| commit | de010b0b2e50cf0b3837ce350b116bc92605f67a (patch) | |
| tree | 226685fbb97461692562035501ebc21a314f718c /src/cryptsetup/cryptsetup.c | |
| parent | list: make LIST_FOREACH() and LIST_FOREACH_BACKWARDS() safer (diff) | |
| download | systemd-de010b0b2e50cf0b3837ce350b116bc92605f67a.tar.xz systemd-de010b0b2e50cf0b3837ce350b116bc92605f67a.zip | |
strv: make iterator in STRV_FOREACH() declaread in the loop
This also avoids multiple evaluations in STRV_FOREACH_BACKWARDS()
Diffstat (limited to 'src/cryptsetup/cryptsetup.c')
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index f2b0269fc5..f92624fb13 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -573,7 +573,7 @@ static int get_password( _cleanup_free_ char *friendly = NULL, *text = NULL, *disk_path = NULL; _cleanup_strv_free_erase_ char **passwords = NULL; - char **p, *id; + char *id; int r = 0; AskPasswordFlags flags = arg_ask_password_flags | ASK_PASSWORD_PUSH_CACHE; @@ -861,7 +861,6 @@ static int attach_luks2_by_fido2( #if HAVE_LIBCRYPTSETUP_PLUGINS AskPasswordFlags flags = ASK_PASSWORD_PUSH_CACHE | ASK_PASSWORD_ACCEPT_CACHED; _cleanup_strv_free_erase_ char **pins = NULL; - char **p; int r; r = crypt_activate_by_token_pin(cd, name, "systemd-fido2", CRYPT_ANY_TOKEN, NULL, 0, usrptr, activation_flags); @@ -1547,7 +1546,6 @@ static int attach_luks_or_plain_or_bitlk_by_passphrase( uint32_t flags, bool pass_volume_key) { - char **p; int r; assert(cd); |