diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-28 15:33:44 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-05-31 23:47:48 +0200 |
| commit | 5d2a48da126e696dcd61baa75911d7f5fb2d076c (patch) | |
| tree | bbc8aac0bd238dfd42fd29fc82d6e7e099ae976f /src/home/homectl.c | |
| parent | oomd: drop unused key (diff) | |
| download | systemd-5d2a48da126e696dcd61baa75911d7f5fb2d076c.tar.xz systemd-5d2a48da126e696dcd61baa75911d7f5fb2d076c.zip | |
tree-wide: use _cleanup_set_free_ and friends
Instead of _cleanup_(set_freep) or so.
Diffstat (limited to 'src/home/homectl.c')
| -rw-r--r-- | src/home/homectl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/home/homectl.c b/src/home/homectl.c index b265f8741e..d6e6bd0855 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -210,7 +210,7 @@ static int acquire_existing_password( bool emphasize_current, AskPasswordFlags flags) { - _cleanup_(strv_free_erasep) char **password = NULL; + _cleanup_strv_free_erase_ char **password = NULL; _cleanup_(erase_and_freep) char *envpw = NULL; _cleanup_free_ char *question = NULL; int r; @@ -271,7 +271,7 @@ static int acquire_recovery_key( UserRecord *hr, AskPasswordFlags flags) { - _cleanup_(strv_free_erasep) char **recovery_key = NULL; + _cleanup_strv_free_erase_ char **recovery_key = NULL; _cleanup_(erase_and_freep) char *envpw = NULL; _cleanup_free_ char *question = NULL; int r; @@ -329,7 +329,7 @@ static int acquire_token_pin( UserRecord *hr, AskPasswordFlags flags) { - _cleanup_(strv_free_erasep) char **pin = NULL; + _cleanup_strv_free_erase_ char **pin = NULL; _cleanup_(erase_and_freep) char *envpin = NULL; _cleanup_free_ char *question = NULL; int r; @@ -699,7 +699,7 @@ static char **mangle_user_list(char **list, char ***ret_allocated) { static int inspect_home(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - _cleanup_(strv_freep) char **mangled_list = NULL; + _cleanup_strv_free_ char **mangled_list = NULL; int r, ret = 0; char **items; @@ -783,7 +783,7 @@ static int inspect_home(int argc, char *argv[], void *userdata) { static int authenticate_home(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - _cleanup_(strv_freep) char **mangled_list = NULL; + _cleanup_strv_free_ char **mangled_list = NULL; int r, ret = 0; char **items; @@ -1187,7 +1187,7 @@ static int acquire_new_password( (void) suggest_passwords(); for (;;) { - _cleanup_(strv_free_erasep) char **first = NULL, **second = NULL; + _cleanup_strv_free_erase_ char **first = NULL, **second = NULL; _cleanup_free_ char *question = NULL; if (--i == 0) @@ -3162,7 +3162,7 @@ static int parse_argv(int argc, char *argv[]) { case ARG_SSH_AUTHORIZED_KEYS: { _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; - _cleanup_(strv_freep) char **l = NULL, **add = NULL; + _cleanup_strv_free_ char **l = NULL, **add = NULL; if (isempty(optarg)) { r = drop_from_identity("sshAuthorizedKeys"); |