From: Yu Watanabe Date: Sat, 18 Jan 2025 18:37:24 +0000 (+0900) Subject: tree-wide: use _cleanup_hashmap_free_ and friends X-Git-Tag: v258-rc1~1552^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe5a1afb67a27c952e20c93635addf651671aeb2;p=thirdparty%2Fsystemd.git tree-wide: use _cleanup_hashmap_free_ and friends --- diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index 551dcb8b272..55ff91d76c8 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -376,7 +376,7 @@ static int vl_method_ask(sd_varlink *link, sd_json_variant *parameters, sd_varli static int vl_server(void) { _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *varlink_server = NULL; - _cleanup_(hashmap_freep) Hashmap *polkit_registry = NULL; + _cleanup_hashmap_free_ Hashmap *polkit_registry = NULL; int r; r = varlink_server_new(&varlink_server, SD_VARLINK_SERVER_INHERIT_USERDATA, /* userdata= */ &polkit_registry); diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c index 6c559e4bf88..99cece16740 100644 --- a/src/basic/namespace-util.c +++ b/src/basic/namespace-util.c @@ -558,7 +558,7 @@ int userns_acquire(const char *uid_map, const char *gid_map) { } int userns_enter_and_pin(int userns_fd, pid_t *ret_pid) { - _cleanup_(close_pairp) int pfd[2] = EBADF_PAIR; + _cleanup_close_pair_ int pfd[2] = EBADF_PAIR; _cleanup_(sigkill_waitp) pid_t pid = 0; ssize_t n; char x; diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 7f79ae4962c..da408fbee24 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -1120,7 +1120,7 @@ static int ask_password_conv( .until = now(CLOCK_MONOTONIC) + 15 * USEC_PER_SEC, }; - _cleanup_(strv_free_erasep) char **acquired = NULL; + _cleanup_strv_free_erase_ char **acquired = NULL; r = ask_password_auto( &req, ASK_PASSWORD_ACCEPT_CACHED| diff --git a/src/creds/creds.c b/src/creds/creds.c index bf76e4acf08..b10c36e66f4 100644 --- a/src/creds/creds.c +++ b/src/creds/creds.c @@ -1425,7 +1425,7 @@ static int run(int argc, char *argv[]) { if (arg_varlink) { _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *varlink_server = NULL; - _cleanup_(hashmap_freep) Hashmap *polkit_registry = NULL; + _cleanup_hashmap_free_ Hashmap *polkit_registry = NULL; /* Invocation as Varlink service */ diff --git a/src/import/importd.c b/src/import/importd.c index ea8257a833d..c3a77178264 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -1370,7 +1370,7 @@ static int method_list_images(sd_bus_message *msg, void *userdata, sd_bus_error class < 0 ? (c < _IMAGE_CLASS_MAX) : (c == class); c++) { - _cleanup_(hashmap_freep) Hashmap *h = NULL; + _cleanup_hashmap_free_ Hashmap *h = NULL; h = hashmap_new(&image_hash_ops); if (!h) diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index ecaf5b33b4a..d5098ba650e 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -1010,7 +1010,7 @@ static int bind_description(sd_bus *b, int fd, int family) { } static int connect_as(int fd, const struct sockaddr *sa, socklen_t salen, uid_t uid, gid_t gid) { - _cleanup_(close_pairp) int pfd[2] = EBADF_PAIR; + _cleanup_close_pair_ int pfd[2] = EBADF_PAIR; ssize_t n; int r; diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c index 1349fd36ab5..c7126ac6e61 100644 --- a/src/libsystemd/sd-varlink/sd-varlink-idl.c +++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c @@ -1607,7 +1607,7 @@ static int varlink_idl_symbol_consistent( const sd_varlink_symbol *symbol, int level) { - _cleanup_(set_freep) Set *input_set = NULL, *output_set = NULL; + _cleanup_set_free_ Set *input_set = NULL, *output_set = NULL; const char *symbol_name; int r; @@ -1654,7 +1654,7 @@ static int varlink_idl_symbol_consistent( } int varlink_idl_consistent(const sd_varlink_interface *interface, int level) { - _cleanup_(set_freep) Set *name_set = NULL; + _cleanup_set_free_ Set *name_set = NULL; int r; assert(interface); diff --git a/src/login/pam_systemd_loadkey.c b/src/login/pam_systemd_loadkey.c index 3b11d764532..f62007d1558 100644 --- a/src/login/pam_systemd_loadkey.c +++ b/src/login/pam_systemd_loadkey.c @@ -73,7 +73,7 @@ _public_ PAM_EXTERN int pam_sm_authenticate( /* Split the key by NUL. Set the last item as authtok. */ - _cleanup_(strv_free_erasep) char **passwords = strv_parse_nulstr(p, n); + _cleanup_strv_free_erase_ char **passwords = strv_parse_nulstr(p, n); if (!passwords) return pam_log_oom(handle); diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c index 9b674c83b55..31f2d47546c 100644 --- a/src/mountfsd/mountwork.c +++ b/src/mountfsd/mountwork.c @@ -567,7 +567,7 @@ static int process_connection(sd_varlink_server *server, int _fd) { static int run(int argc, char *argv[]) { usec_t start_time, listen_idle_usec, last_busy_usec = USEC_INFINITY; _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *server = NULL; - _cleanup_(hashmap_freep) Hashmap *polkit_registry = NULL; + _cleanup_hashmap_free_ Hashmap *polkit_registry = NULL; _cleanup_(pidref_done) PidRef parent = PIDREF_NULL; unsigned n_iterations = 0; int m, listen_fd, r; diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c index ab1cd0a7c13..152b506da52 100644 --- a/src/nsresourced/nsresourced-manager.c +++ b/src/nsresourced/nsresourced-manager.c @@ -595,7 +595,7 @@ static int manager_setup_bpf(Manager *m) { #endif int manager_startup(Manager *m) { - _cleanup_(set_freep) Set *fdstore_inodes = NULL, *registry_inodes = NULL; + _cleanup_set_free_ Set *fdstore_inodes = NULL, *registry_inodes = NULL; void *p; int r; diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index 72b13f8fac4..92634b53f4c 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -4548,7 +4548,7 @@ static int make_policy(bool force, RecoveryPinMode recovery_pin_mode) { if (r < 0) return log_error_errno(r, "Failed to acquire PIN from environment: %m"); if (r == 0) { - _cleanup_(strv_free_erasep) char **l = NULL; + _cleanup_strv_free_erase_ char **l = NULL; AskPasswordRequest req = { .tty_fd = -EBADF, diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index e57af662218..0696857802f 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -612,7 +612,7 @@ DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR( dns_stream_unref); int dns_stream_disconnect_all(Manager *m) { - _cleanup_(set_freep) Set *closed = NULL; + _cleanup_set_free_ Set *closed = NULL; int r; assert(m); diff --git a/src/shared/openssl-util.c b/src/shared/openssl-util.c index b60fc67b26c..302cf3d0f6f 100644 --- a/src/shared/openssl-util.c +++ b/src/shared/openssl-util.c @@ -1398,7 +1398,7 @@ static int openssl_ask_password_ui_read(UI *ui, UI_STRING *uis) { req->message = UI_get0_output_string(uis); - _cleanup_(strv_freep) char **l = NULL; + _cleanup_strv_free_ char **l = NULL; r = ask_password_auto(req, ASK_PASSWORD_ACCEPT_CACHED|ASK_PASSWORD_PUSH_CACHE, &l); if (r < 0) { log_error_errno(r, "Failed to query for PIN: %m"); diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index e1485a84d4f..81effec21ab 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -646,7 +646,7 @@ TEST(hashmap_get) { } TEST(hashmap_get2) { - _cleanup_(hashmap_free_free_freep) Hashmap *m = NULL; + _cleanup_hashmap_free_free_free_ Hashmap *m = NULL; char *r; char *val; char key_orig[] = "Key 1";