tree-wide: use _cleanup_set_free_ and friends

Instead of _cleanup_(set_freep) or so.

52 files changed, 94 insertions, 94 deletions

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 56bc362776..1fcdbf9cd3 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -2229,7 +2229,7 @@ static int property_read_ip_filters(
                 void *userdata) {
 
         SecurityInfo *info = userdata;
-        _cleanup_(strv_freep) char **l = NULL;
+        _cleanup_strv_free_ char **l = NULL;
         int r;
 
         assert(bus);
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d6b2dcb114..c02ad09c07 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2153,7 +2153,7 @@ static int list_unit_files_by_patterns(sd_bus_message *message, void *userdata,
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         Manager *m = ASSERT_PTR(userdata);
         UnitFileList *item;
-        _cleanup_(hashmap_freep) Hashmap *h = NULL;
+        _cleanup_hashmap_free_ Hashmap *h = NULL;
         int r;
 
         assert(message);
diff --git a/src/core/unit.c b/src/core/unit.c
index 8b4fb0fce4..7b6d50e0ea 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1082,7 +1082,7 @@ static void unit_merge_dependencies(Unit *u, Unit *other) {
         }
 
         for (;;) {
-                _cleanup_(hashmap_freep) Hashmap *other_deps = NULL;
+                _cleanup_hashmap_free_ Hashmap *other_deps = NULL;
                 UnitDependencyInfo di_back;
                 Unit *back;
 
diff --git a/src/creds/creds.c b/src/creds/creds.c
index 670e719d21..51efe27616 100644
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -122,7 +122,7 @@ not_found:
 }
 
 static int add_credentials_to_table(Table *t, bool encrypted) {
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         const char *prefix;
         int r;
 
@@ -382,7 +382,7 @@ static int verb_cat(int argc, char **argv, void *userdata) {
 
                 /* Look both in regular and in encrypted credentials */
                 for (encrypted = 0; encrypted < 2; encrypted++) {
-                        _cleanup_(closedirp) DIR *d = NULL;
+                        _cleanup_closedir_ DIR *d = NULL;
 
                         r = open_credential_directory(encrypted, &d, NULL);
                         if (r < 0)
diff --git a/src/cryptenroll/cryptenroll-wipe.c b/src/cryptenroll/cryptenroll-wipe.c
index 8042a0fe83..314ebd3113 100644
--- a/src/cryptenroll/cryptenroll-wipe.c
+++ b/src/cryptenroll/cryptenroll-wipe.c
@@ -88,7 +88,7 @@ static int find_slots_by_mask(
                 Set *keep_slots,
                 unsigned by_mask) {
 
-        _cleanup_(set_freep) Set *listed_slots = NULL;
+        _cleanup_set_free_ Set *listed_slots = NULL;
         int r;
 
         assert(cd);
@@ -301,7 +301,7 @@ int wipe_slots(struct crypt_device *cd,
                unsigned by_mask,
                int except_slot) {
 
-        _cleanup_(set_freep) Set *wipe_slots = NULL, *wipe_tokens = NULL, *keep_slots = NULL;
+        _cleanup_set_free_ Set *wipe_slots = NULL, *wipe_tokens = NULL, *keep_slots = NULL;
         _cleanup_free_ int *ordered_slots = NULL, *ordered_tokens = NULL;
         size_t n_ordered_slots = 0, n_ordered_tokens = 0;
         int r, slot_max, ret;
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 45e0abc63d..5c742497d5 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -1569,7 +1569,7 @@ static int action_with(DissectedImage *m, LoopDevice *d) {
 }
 
 static int action_discover(void) {
-        _cleanup_(hashmap_freep) Hashmap *images = NULL;
+        _cleanup_hashmap_free_ Hashmap *images = NULL;
         _cleanup_(table_unrefp) Table *t = NULL;
         Image *img;
         int r;
diff --git a/src/home/homectl-pkcs11.c b/src/home/homectl-pkcs11.c
index dc6ecf1665..2539af0631 100644
--- a/src/home/homectl-pkcs11.c
+++ b/src/home/homectl-pkcs11.c
@@ -100,7 +100,7 @@ static int add_pkcs11_token_uri(JsonVariant **v, const char *uri) {
 
 int identity_add_token_pin(JsonVariant **v, const char *pin) {
         _cleanup_(json_variant_unrefp) JsonVariant *w = NULL, *l = NULL;
-        _cleanup_(strv_free_erasep) char **pins = NULL;
+        _cleanup_strv_free_erase_ char **pins = NULL;
         int r;
 
         assert(v);
diff --git a/src/home/homectl-recovery-key.c b/src/home/homectl-recovery-key.c
index ff1ab6820d..bf18ae49e4 100644
--- a/src/home/homectl-recovery-key.c
+++ b/src/home/homectl-recovery-key.c
@@ -67,7 +67,7 @@ static int add_public(JsonVariant **v) {
 
 static int add_secret(JsonVariant **v, const char *password) {
         _cleanup_(json_variant_unrefp) JsonVariant *w = NULL, *l = NULL;
-        _cleanup_(strv_free_erasep) char **passwords = NULL;
+        _cleanup_strv_free_erase_ char **passwords = NULL;
         int r;
 
         assert(v);
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");
diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c
index ca639ae39e..7cf543922f 100644
--- a/src/home/homed-manager-bus.c
+++ b/src/home/homed-manager-bus.c
@@ -36,7 +36,7 @@ static int property_get_auto_login(
                 return r;
 
         HASHMAP_FOREACH(h, m->homes_by_name) {
-                _cleanup_(strv_freep) char **seats = NULL;
+                _cleanup_strv_free_ char **seats = NULL;
                 _cleanup_free_ char *home_path = NULL;
 
                 r = home_auto_login(h, &seats);
diff --git a/src/home/homed-manager.c b/src/home/homed-manager.c
index 92fe5a88b8..9db8b9ee06 100644
--- a/src/home/homed-manager.c
+++ b/src/home/homed-manager.c
@@ -1357,7 +1357,7 @@ static int manager_enumerate_devices(Manager *m) {
 }
 
 static int manager_load_key_pair(Manager *m) {
-        _cleanup_(fclosep) FILE *f = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         struct stat st;
         int r;
 
diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index 8ad1da6303..dff99e5a86 100644
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -60,7 +60,7 @@ int home_setup_cifs(
         STRV_FOREACH(pw, h->password) {
                 _cleanup_(unlink_and_freep) char *p = NULL;
                 _cleanup_free_ char *options = NULL;
-                _cleanup_(fclosep) FILE *f = NULL;
+                _cleanup_fclose_ FILE *f = NULL;
                 pid_t mount_pid;
                 int exit_status;
 
diff --git a/src/home/homework.c b/src/home/homework.c
index 28907386a4..f8e333bb97 100644
--- a/src/home/homework.c
+++ b/src/home/homework.c
@@ -511,7 +511,7 @@ int home_sync_and_statfs(int root_fd, struct statfs *ret) {
 }
 
 static int read_identity_file(int root_fd, JsonVariant **ret) {
-        _cleanup_(fclosep) FILE *identity_file = NULL;
+        _cleanup_fclose_ FILE *identity_file = NULL;
         _cleanup_close_ int identity_fd = -EBADF;
         unsigned line, column;
         int r;
@@ -542,7 +542,7 @@ static int read_identity_file(int root_fd, JsonVariant **ret) {
 
 static int write_identity_file(int root_fd, JsonVariant *v, uid_t uid) {
         _cleanup_(json_variant_unrefp) JsonVariant *normalized = NULL;
-        _cleanup_(fclosep) FILE *identity_file = NULL;
+        _cleanup_fclose_ FILE *identity_file = NULL;
         _cleanup_close_ int identity_fd = -EBADF;
         _cleanup_free_ char *fn = NULL;
         int r;
@@ -1088,7 +1088,7 @@ static int user_record_compile_effective_passwords(
                 PasswordCache *cache,
                 char ***ret_effective_passwords) {
 
-        _cleanup_(strv_free_erasep) char **effective = NULL;
+        _cleanup_strv_free_erase_ char **effective = NULL;
         size_t n;
         int r;
 
@@ -1307,7 +1307,7 @@ static int determine_default_storage(UserStorage *ret) {
 }
 
 static int home_create(UserRecord *h, UserRecord **ret_home) {
-        _cleanup_(strv_free_erasep) char **effective_passwords = NULL;
+        _cleanup_strv_free_erase_ char **effective_passwords = NULL;
         _cleanup_(home_setup_done) HomeSetup setup = HOME_SETUP_INIT;
         _cleanup_(user_record_unrefp) UserRecord *new_home = NULL;
         _cleanup_(password_cache_free) PasswordCache cache = {};
@@ -1679,7 +1679,7 @@ static int home_resize(UserRecord *h, bool automatic, UserRecord **ret) {
 
 static int home_passwd(UserRecord *h, UserRecord **ret_home) {
         _cleanup_(user_record_unrefp) UserRecord *header_home = NULL, *embedded_home = NULL, *new_home = NULL;
-        _cleanup_(strv_free_erasep) char **effective_passwords = NULL;
+        _cleanup_strv_free_erase_ char **effective_passwords = NULL;
         _cleanup_(home_setup_done) HomeSetup setup = HOME_SETUP_INIT;
         _cleanup_(password_cache_free) PasswordCache cache = {};
         HomeSetupFlags flags = 0;
@@ -1850,7 +1850,7 @@ static int home_unlock(UserRecord *h) {
 static int run(int argc, char *argv[]) {
         _cleanup_(user_record_unrefp) UserRecord *home = NULL, *new_home = NULL;
         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
-        _cleanup_(fclosep) FILE *opened_file = NULL;
+        _cleanup_fclose_ FILE *opened_file = NULL;
         unsigned line = 0, column = 0;
         const char *json_path = NULL;
         FILE *json_file;
diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c
index 08f1764d11..58f8ecc6f0 100644
--- a/src/home/user-record-util.c
+++ b/src/home/user-record-util.c
@@ -871,7 +871,7 @@ int user_record_set_hashed_password(UserRecord *h, char **hashed_password) {
 
 int user_record_set_password(UserRecord *h, char **password, bool prepend) {
         _cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
-        _cleanup_(strv_free_erasep) char **e = NULL;
+        _cleanup_strv_free_erase_ char **e = NULL;
         int r;
 
         assert(h);
@@ -933,7 +933,7 @@ int user_record_set_password(UserRecord *h, char **password, bool prepend) {
 
 int user_record_set_token_pin(UserRecord *h, char **pin, bool prepend) {
         _cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
-        _cleanup_(strv_free_erasep) char **e = NULL;
+        _cleanup_strv_free_erase_ char **e = NULL;
         int r;
 
         assert(h);
diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c
index 8c6d59e040..fb3ae9f329 100644
--- a/src/libsystemd/sd-device/test-sd-device.c
+++ b/src/libsystemd/sd-device/test-sd-device.c
@@ -266,7 +266,7 @@ static void test_sd_device_enumerator_filter_subsystem_one(
 
 static bool test_sd_device_enumerator_filter_subsystem_trial(void) {
         _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
-        _cleanup_(hashmap_freep) Hashmap *subsystems = NULL;
+        _cleanup_hashmap_free_ Hashmap *subsystems = NULL;
         unsigned n_new_dev = 0, n_removed_dev = 0;
         sd_device *d;
         Hashmap *h;
diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c
index c5497e5148..fe0d83116d 100644
--- a/src/libsystemd/sd-event/test-event.c
+++ b/src/libsystemd/sd-event/test-event.c
@@ -841,7 +841,7 @@ TEST(leave_ratelimit) {
         bool expect_ratelimit = false, manually_left_ratelimit = false;
         _cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
-        _cleanup_(close_pairp) int pfd[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
         unsigned c = 0;
         int r;
 
diff --git a/src/notify/notify.c b/src/notify/notify.c
index c15df588ef..f30790bc70 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -132,7 +132,7 @@ static int parse_argv(int argc, char *argv[]) {
                 {}
         };
 
-        _cleanup_(fdset_freep) FDSet *passed = NULL;
+        _cleanup_fdset_free_ FDSet *passed = NULL;
         bool do_exec = false;
         int c, r, n_env;
 
diff --git a/src/partition/repart.c b/src/partition/repart.c
index 2e9badfd31..89f7211bfd 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -5261,7 +5261,7 @@ static int resolve_copy_blocks_auto(
 
         const char *try1 = NULL, *try2 = NULL;
         char p[SYS_BLOCK_PATH_MAX("/slaves")];
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         sd_id128_t found_uuid = SD_ID128_NULL;
         dev_t devno, found = 0;
         int r;
diff --git a/src/portable/portable.c b/src/portable/portable.c
index 7ab3ac6e97..1c31377567 100644
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -357,7 +357,7 @@ static int portable_extract_by_path(
         else {
                 _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
                 _cleanup_(rmdir_and_freep) char *tmpdir = NULL;
-                _cleanup_(close_pairp) int seq[2] = PIPE_EBADF;
+                _cleanup_close_pair_ int seq[2] = PIPE_EBADF;
                 _cleanup_(sigkill_waitp) pid_t child = 0;
 
                 /* We now have a loopback block device, let's fork off a child in its own mount namespace, mount it
@@ -689,7 +689,7 @@ int portable_extract(
         _cleanup_(portable_metadata_unrefp) PortableMetadata *os_release = NULL;
         _cleanup_ordered_hashmap_free_ OrderedHashmap *extension_images = NULL, *extension_releases = NULL;
         _cleanup_hashmap_free_ Hashmap *unit_files = NULL;
-        _cleanup_(strv_freep) char **valid_prefixes = NULL;
+        _cleanup_strv_free_ char **valid_prefixes = NULL;
         _cleanup_(image_unrefp) Image *image = NULL;
         int r;
 
diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index 0a1bf00366..4501b38cff 100644
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -281,7 +281,7 @@ static int process_dmesg_files(PStoreList *list) {
 }
 
 static int list_files(PStoreList *list, const char *sourcepath) {
-        _cleanup_(closedirp) DIR *dirp = NULL;
+        _cleanup_closedir_ DIR *dirp = NULL;
         int r;
 
         dirp = opendir(sourcepath);
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index a5ae2478fe..6459f5d2f8 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -854,7 +854,7 @@ static int boot_entries_find_unified(
                 const char *root,
                 const char *dir) {
 
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         _cleanup_free_ char *full = NULL;
         int r;
 
diff --git a/src/shared/data-fd-util.c b/src/shared/data-fd-util.c
index 4831682a02..86baf9bfa1 100644
--- a/src/shared/data-fd-util.c
+++ b/src/shared/data-fd-util.c
@@ -206,7 +206,7 @@ int copy_data_fd(int fd) {
                         /* Hmm, pity, this didn't fit. Let's fall back to /tmp then, see below */
 
                 } else {
-                        _cleanup_(close_pairp) int pipefds[2] = PIPE_EBADF;
+                        _cleanup_close_pair_ int pipefds[2] = PIPE_EBADF;
                         int isz;
 
                         /* If memfds aren't available, use a pipe. Set O_NONBLOCK so that we will get EAGAIN rather
diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c
index 5885215a1c..68d186117f 100644
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@ -570,7 +570,7 @@ static int parse_core(int fd, const char *executable, char **ret, JsonVariant **
         };
 
         _cleanup_(json_variant_unrefp) JsonVariant *package_metadata = NULL;
-        _cleanup_(set_freep) Set *modules = NULL;
+        _cleanup_set_free_ Set *modules = NULL;
         _cleanup_free_ char *buf = NULL; /* buf should be freed last, c.f closed first (via stack_context_destroy) */
         _cleanup_(stack_context_destroy) StackContext c = {
                 .package_metadata = &package_metadata,
@@ -636,7 +636,7 @@ static int parse_core(int fd, const char *executable, char **ret, JsonVariant **
 
 static int parse_elf(int fd, const char *executable, char **ret, JsonVariant **ret_package_metadata) {
         _cleanup_(json_variant_unrefp) JsonVariant *package_metadata = NULL, *elf_metadata = NULL;
-        _cleanup_(set_freep) Set *modules = NULL;
+        _cleanup_set_free_ Set *modules = NULL;
         _cleanup_free_ char *buf = NULL; /* buf should be freed last, c.f closed first (via stack_context_destroy) */
         _cleanup_(stack_context_destroy) StackContext c = {
                 .package_metadata = &package_metadata,
diff --git a/src/shared/kbd-util.c b/src/shared/kbd-util.c
index 6222ef4fc8..3100862548 100644
--- a/src/shared/kbd-util.c
+++ b/src/shared/kbd-util.c
@@ -64,7 +64,7 @@ static int keymap_recurse_dir_callback(
 }
 
 int get_keymaps(char ***ret) {
-        _cleanup_(set_free_freep) Set *keymaps = NULL;
+        _cleanup_set_free_free_ Set *keymaps = NULL;
         int r;
 
         keymaps = set_new(&string_hash_ops);
diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c
index 6802ad0d3d..57c4058487 100644
--- a/src/shared/libfido2-util.c
+++ b/src/shared/libfido2-util.c
@@ -820,7 +820,7 @@ int fido2_generate_hmac_hash(
                                                "Token asks for PIN but doesn't advertise 'clientPin' feature.");
 
                 for (;;) {
-                        _cleanup_(strv_free_erasep) char **pin = NULL;
+                        _cleanup_strv_free_erase_ char **pin = NULL;
 
                         r = ask_password_auto("Please enter security token PIN:", askpw_icon_name, NULL, "fido2-pin", "fido2-pin", USEC_INFINITY, 0, &pin);
                         if (r < 0)
diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 08e89dc228..6ee4307c68 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -548,7 +548,7 @@ int make_filesystem(
 }
 
 int mkfs_options_from_env(const char *component, const char *fstype, char ***ret) {
-        _cleanup_(strv_freep) char **l = NULL;
+        _cleanup_strv_free_ char **l = NULL;
         const char *e;
         char *n;
 
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 2e3b47ddca..d388c89192 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -222,7 +222,7 @@ int battery_is_discharging_and_low(void) {
 /* Store current capacity of each battery before suspension and timestamp */
 int fetch_batteries_capacity_by_name(Hashmap **ret) {
         _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
-        _cleanup_(hashmap_freep) Hashmap *batteries_capacity_by_name = NULL;
+        _cleanup_hashmap_free_ Hashmap *batteries_capacity_by_name = NULL;
         sd_device *dev;
         int r;
 
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index c21f5b2274..680cc726c3 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -2847,7 +2847,7 @@ int tpm2_unseal(const char *device,
 int tpm2_list_devices(void) {
 #if HAVE_TPM2
         _cleanup_(table_unrefp) Table *t = NULL;
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         r = dlopen_tpm2();
@@ -2923,7 +2923,7 @@ int tpm2_find_device_auto(
                 int log_level, /* log level when no device is found */
                 char **ret) {
 #if HAVE_TPM2
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         r = dlopen_tpm2();
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index a7896297ae..dfff5aba72 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -395,8 +395,8 @@ static int userdb_start_query(
                 JsonVariant *query,
                 UserDBFlags flags) {
 
-        _cleanup_(strv_freep) char **except = NULL, **only = NULL;
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_strv_free_ char **except = NULL, **only = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         const char *e;
         int r, ret = 0;
 
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 93e082d77e..221d29ba6c 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -605,7 +605,7 @@ static void log_umount_blockers(const char *mnt) {
 }
 
 static int remount_with_timeout(MountPoint *m, bool last_try) {
-        _cleanup_(close_pairp) int pfd[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
         _cleanup_(sigkill_nowaitp) pid_t pid = 0;
         int r;
 
@@ -661,7 +661,7 @@ static int remount_with_timeout(MountPoint *m, bool last_try) {
 }
 
 static int umount_with_timeout(MountPoint *m, bool last_try) {
-        _cleanup_(close_pairp) int pfd[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
         _cleanup_(sigkill_nowaitp) pid_t pid = 0;
         int r;
 
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index d752ad2742..c9b277b124 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -443,7 +443,7 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 static int run(int argc, char *argv[]) {
-        _cleanup_(ordered_hashmap_freep) OrderedHashmap *sysctl_options = NULL;
+        _cleanup_ordered_hashmap_free_ OrderedHashmap *sysctl_options = NULL;
         int r, k;
 
         r = parse_argv(argc, argv);
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index f5b2248040..ec231da7a8 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -788,7 +788,7 @@ static int merge(Hashmap *images) {
 }
 
 static int image_discover_and_read_metadata(Hashmap **ret_images) {
-        _cleanup_(hashmap_freep) Hashmap *images = NULL;
+        _cleanup_hashmap_free_ Hashmap *images = NULL;
         Image *img;
         int r;
 
@@ -814,7 +814,7 @@ static int image_discover_and_read_metadata(Hashmap **ret_images) {
 }
 
 static int verb_merge(int argc, char **argv, void *userdata) {
-        _cleanup_(hashmap_freep) Hashmap *images = NULL;
+        _cleanup_hashmap_free_ Hashmap *images = NULL;
         int r;
 
         r = have_effective_cap(CAP_SYS_ADMIN);
@@ -852,7 +852,7 @@ static int verb_merge(int argc, char **argv, void *userdata) {
 }
 
 static int verb_refresh(int argc, char **argv, void *userdata) {
-        _cleanup_(hashmap_freep) Hashmap *images = NULL;
+        _cleanup_hashmap_free_ Hashmap *images = NULL;
         int r;
 
         r = have_effective_cap(CAP_SYS_ADMIN);
@@ -892,7 +892,7 @@ static int verb_refresh(int argc, char **argv, void *userdata) {
 }
 
 static int verb_list(int argc, char **argv, void *userdata) {
-        _cleanup_(hashmap_freep) Hashmap *images = NULL;
+        _cleanup_hashmap_free_ Hashmap *images = NULL;
         _cleanup_(table_unrefp) Table *t = NULL;
         Image *img;
         int r;
diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
index aff823d773..e3f25d52d5 100644
--- a/src/systemctl/systemctl-edit.c
+++ b/src/systemctl/systemctl-edit.c
@@ -14,7 +14,7 @@
 #include "terminal-util.h"
 
 int verb_cat(int argc, char *argv[], void *userdata) {
-        _cleanup_(hashmap_freep) Hashmap *cached_name_map = NULL, *cached_id_map = NULL;
+        _cleanup_hashmap_free_ Hashmap *cached_name_map = NULL, *cached_id_map = NULL;
         _cleanup_(lookup_paths_free) LookupPaths lp = {};
         _cleanup_strv_free_ char **names = NULL;
         sd_bus *bus;
@@ -197,7 +197,7 @@ static int find_paths_to_edit(
                 EditFileContext *context,
                 char **names) {
 
-        _cleanup_(hashmap_freep) Hashmap *cached_name_map = NULL, *cached_id_map = NULL;
+        _cleanup_hashmap_free_ Hashmap *cached_name_map = NULL, *cached_id_map = NULL;
         _cleanup_(lookup_paths_free) LookupPaths lp = {};
         _cleanup_free_ char *drop_in_alloc = NULL, *suffix = NULL;
         const char *drop_in;
diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c
index aad248fe1f..fc1ad9800a 100644
--- a/src/systemctl/systemctl-list-unit-files.c
+++ b/src/systemctl/systemctl-list-unit-files.c
@@ -143,7 +143,7 @@ static int output_unit_file_list(const UnitFileList *units, unsigned c) {
 int verb_list_unit_files(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_free_ UnitFileList *units = NULL;
-        _cleanup_(hashmap_freep) Hashmap *h = NULL;
+        _cleanup_hashmap_free_ Hashmap *h = NULL;
         unsigned c = 0;
         const char *state;
         char *path;
diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c
index 5f06377ade..201b37528a 100644
--- a/src/sysupdate/sysupdate-resource.c
+++ b/src/sysupdate/sysupdate-resource.c
@@ -72,7 +72,7 @@ static int resource_load_from_directory(
                 Resource *rr,
                 mode_t m) {
 
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         assert(rr);
@@ -242,7 +242,7 @@ static int download_manifest(
                 size_t *ret_size) {
 
         _cleanup_free_ char *buffer = NULL, *suffixed_url = NULL;
-        _cleanup_(close_pairp) int pfd[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
         _cleanup_fclose_ FILE *manifest = NULL;
         size_t size = 0;
         pid_t pid;
diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c
index 8ae58c2b1b..f7009315a2 100644
--- a/src/sysupdate/sysupdate-transfer.c
+++ b/src/sysupdate/sysupdate-transfer.c
@@ -570,7 +570,7 @@ int transfer_resolve_paths(
 }
 
 static void transfer_remove_temporary(Transfer *t) {
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         assert(t);
diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 76777dc08e..023eaac586 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -1093,7 +1093,7 @@ static int component_name_valid(const char *c) {
 static int verb_components(int argc, char **argv, void *userdata) {
         _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
         _cleanup_(umount_and_rmdir_and_freep) char *mounted_dir = NULL;
-        _cleanup_(set_freep) Set *names = NULL;
+        _cleanup_set_free_ Set *names = NULL;
         _cleanup_free_ char **z = NULL; /* We use simple free() rather than strv_free() here, since set_free() will free the strings for us */
         char **l = CONF_PATHS_STRV("");
         bool has_default_component = false;
diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c
index c0febec208..c5a4b08469 100644
--- a/src/test/test-data-fd-util.c
+++ b/src/test/test-data-fd-util.c
@@ -81,7 +81,7 @@ static void assert_equal_fd(int fd1, int fd2) {
 
 TEST(copy_data_fd) {
         _cleanup_close_ int fd1 = -EBADF, fd2 = -EBADF;
-        _cleanup_(close_pairp) int sfd[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int sfd[2] = PIPE_EBADF;
         _cleanup_(sigkill_waitp) pid_t pid = -1;
         int r;
 
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index d5e5dcaa68..560a64b959 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -11,7 +11,7 @@
 #include "tests.h"
 
 TEST(hashmap_replace) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
         _cleanup_free_ char *val1 = NULL, *val2 = NULL, *val3 = NULL, *val4 = NULL, *val5 = NULL;
         char *r;
 
@@ -43,8 +43,8 @@ TEST(hashmap_replace) {
 }
 
 TEST(hashmap_copy) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
-        _cleanup_(hashmap_free_freep) Hashmap *copy = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *copy = NULL;
         char *val1, *val2, *val3, *val4, *r;
 
         val1 = strdup("val1");
@@ -76,8 +76,8 @@ TEST(hashmap_copy) {
 }
 
 TEST(hashmap_get_strv) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
-        _cleanup_(strv_freep) char **strv = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
+        _cleanup_strv_free_ char **strv = NULL;
         char *val1, *val2, *val3, *val4;
 
         val1 = strdup("val1");
@@ -109,7 +109,7 @@ TEST(hashmap_get_strv) {
 }
 
 TEST(hashmap_move_one) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL, *n = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL, *n = NULL;
         char *val1, *val2, *val3, *val4, *r;
 
         val1 = strdup("val1");
@@ -145,7 +145,7 @@ TEST(hashmap_move_one) {
 }
 
 TEST(hashmap_move) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL, *n = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL, *n = NULL;
         char *val1, *val2, *val3, *val4, *r;
 
         val1 = strdup("val1");
@@ -184,7 +184,7 @@ TEST(hashmap_move) {
 }
 
 TEST(hashmap_update) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
         _cleanup_free_ char *val1 = NULL, *val2 = NULL;
         char *r;
 
@@ -208,7 +208,7 @@ TEST(hashmap_update) {
 }
 
 TEST(hashmap_put) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
         int valid_hashmap_put;
         void *val1 = (void*) "val 1";
         void *val2 = (void*) "val 2";
@@ -417,7 +417,7 @@ TEST(hashmap_ensure_allocated) {
 }
 
 TEST(hashmap_foreach_key) {
-        _cleanup_(hashmap_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_ Hashmap *m = NULL;
         bool key_found[] = { false, false, false, false };
         const char *s;
         const char *key;
@@ -449,7 +449,7 @@ TEST(hashmap_foreach_key) {
 }
 
 TEST(hashmap_foreach) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
         bool value_found[] = { false, false, false, false };
         char *val1, *val2, *val3, *val4, *s;
         unsigned count;
@@ -496,8 +496,8 @@ TEST(hashmap_foreach) {
 }
 
 TEST(hashmap_merge) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
-        _cleanup_(hashmap_freep) Hashmap *n = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
+        _cleanup_hashmap_free_ Hashmap *n = NULL;
         char *val1, *val2, *val3, *val4, *r;
 
         val1 = strdup("my val1");
@@ -528,7 +528,7 @@ TEST(hashmap_merge) {
 }
 
 TEST(hashmap_contains) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
         char *val1;
 
         val1 = strdup("my val");
@@ -547,7 +547,7 @@ TEST(hashmap_contains) {
 }
 
 TEST(hashmap_isempty) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
         char *val1;
 
         val1 = strdup("my val");
@@ -563,7 +563,7 @@ TEST(hashmap_isempty) {
 }
 
 TEST(hashmap_size) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
         char *val1, *val2, *val3, *val4;
 
         val1 = strdup("my val");
@@ -591,7 +591,7 @@ TEST(hashmap_size) {
 }
 
 TEST(hashmap_get) {
-        _cleanup_(hashmap_free_freep) Hashmap *m = NULL;
+        _cleanup_hashmap_free_free_ Hashmap *m = NULL;
         char *r;
         char *val;
 
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index 80166b17c6..efd75b2a67 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -578,7 +578,7 @@ TEST(preset_and_list) {
         UnitFileState state;
         bool got_yes = false, got_no = false;
         UnitFileList *fl;
-        _cleanup_(hashmap_freep) Hashmap *h = NULL;
+        _cleanup_hashmap_free_ Hashmap *h = NULL;
 
         CLEANUP_ARRAY(changes, n_changes, install_changes_free);
 
diff --git a/src/test/test-install.c b/src/test/test-install.c
index 9fba0a8ca8..b54252efc8 100644
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -20,7 +20,7 @@ static void dump_changes(InstallChange *c, unsigned n) {
 }
 
 int main(int argc, char* argv[]) {
-        _cleanup_(hashmap_freep) Hashmap *h = NULL;
+        _cleanup_hashmap_free_ Hashmap *h = NULL;
         UnitFileList *p;
         int r;
         const char *const files[] = { "avahi-daemon.service", NULL };
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 708abb7026..e4ee9f697d 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -41,7 +41,7 @@ STATIC_DESTRUCTOR_REGISTER(runtime_dir, rm_rf_physical_and_freep);
 
 TEST_RET(unit_file_get_set) {
         int r;
-        _cleanup_(hashmap_freep) Hashmap *h = NULL;
+        _cleanup_hashmap_free_ Hashmap *h = NULL;
         UnitFileList *p;
 
         h = hashmap_new(&unit_file_list_hash_ops_free);
diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index fad5496052..f76d3543eb 100644
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -143,7 +143,7 @@ static int run(int argc, char *argv[]) {
         sd_id128_t id;
 #endif
         _cleanup_free_ char *p = NULL, *cmd = NULL;
-        _cleanup_(pclosep) FILE *sfdisk = NULL;
+        _cleanup_pclose_ FILE *sfdisk = NULL;
         _cleanup_(loop_device_unrefp) LoopDevice *loop = NULL;
         _cleanup_close_ int fd = -EBADF;
         int r;
diff --git a/src/test/test-set.c b/src/test/test-set.c
index 259ffa7ce2..0d5a6a1856 100644
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -145,8 +145,8 @@ TEST(set_ensure_allocated) {
 }
 
 TEST(set_copy) {
-        _cleanup_(set_freep) Set *s = NULL;
-        _cleanup_(set_free_freep) Set *copy = NULL;
+        _cleanup_set_free_ Set *s = NULL;
+        _cleanup_set_free_free_ Set *copy = NULL;
         char *key1, *key2, *key3, *key4;
 
         key1 = strdup("key1");
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 5feafc95e0..cfd662b329 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -260,7 +260,7 @@ TEST(invalid_unquote) {
 }
 
 TEST(strv_split) {
-        _cleanup_(strv_free_erasep) char **l = NULL;
+        _cleanup_strv_free_erase_ char **l = NULL;
         const char str[] = "one,two,three";
 
         l = strv_split(str, ",");
diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c
index 679d235c78..631305e8f0 100644
--- a/src/test/test-varlink.c
+++ b/src/test/test-varlink.c
@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *tmpdir = NULL;
         _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
-        _cleanup_(close_pairp) int block_fds[2] = PIPE_EBADF;
+        _cleanup_close_pair_ int block_fds[2] = PIPE_EBADF;
         pthread_t t;
         const char *sp;
 
diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c
index edf0dfb73d..7b5592b9c2 100644
--- a/src/tmpfiles/offline-passwd.c
+++ b/src/tmpfiles/offline-passwd.c
@@ -35,7 +35,7 @@ static int open_passwd_file(const char *root, const char *fname, FILE **ret_file
 }
 
 static int populate_uid_cache(const char *root, Hashmap **ret) {
-        _cleanup_(hashmap_freep) Hashmap *cache = NULL;
+        _cleanup_hashmap_free_ Hashmap *cache = NULL;
         int r;
 
         cache = hashmap_new(&uid_gid_hash_ops);
@@ -76,7 +76,7 @@ static int populate_uid_cache(const char *root, Hashmap **ret) {
 }
 
 static int populate_gid_cache(const char *root, Hashmap **ret) {
-        _cleanup_(hashmap_freep) Hashmap *cache = NULL;
+        _cleanup_hashmap_free_ Hashmap *cache = NULL;
         int r;
 
         cache = hashmap_new(&uid_gid_hash_ops);
diff --git a/src/tmpfiles/test-offline-passwd.c b/src/tmpfiles/test-offline-passwd.c
index b70cef4753..ef49582510 100644
--- a/src/tmpfiles/test-offline-passwd.c
+++ b/src/tmpfiles/test-offline-passwd.c
@@ -17,7 +17,7 @@ static void test_resolve_one(const char *name) {
 
         log_info("/* %s(\"%s\") */", __func__, name);
 
-        _cleanup_(hashmap_freep) Hashmap *uid_cache = NULL, *gid_cache = NULL;
+        _cleanup_hashmap_free_ Hashmap *uid_cache = NULL, *gid_cache = NULL;
         uid_t uid = UID_INVALID;
         gid_t gid = GID_INVALID;
         int r;
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 1cb8f06b3e..af1b904d32 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4055,7 +4055,7 @@ static int read_config_file(
                 bool ignore_enoent,
                 bool *invalid_config) {
 
-        _cleanup_(hashmap_freep) Hashmap *uid_cache = NULL, *gid_cache = NULL;
+        _cleanup_hashmap_free_ Hashmap *uid_cache = NULL, *gid_cache = NULL;
         _cleanup_fclose_ FILE *_f = NULL;
         _cleanup_free_ char *pp = NULL;
         unsigned v = 0;
diff --git a/src/udev/udevadm-lock.c b/src/udev/udevadm-lock.c
index b9f18d1552..81b21f0ab0 100644
--- a/src/udev/udevadm-lock.c
+++ b/src/udev/udevadm-lock.c
@@ -287,7 +287,7 @@ static int lock_device(
 }
 
 int lock_main(int argc, char *argv[], void *userdata) {
-        _cleanup_(fdset_freep) FDSet *fds = NULL;
+        _cleanup_fdset_free_ FDSet *fds = NULL;
         _cleanup_free_ dev_t *devnos = NULL;
         size_t n_devnos = 0;
         usec_t deadline;
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 67675b4b7f..a7db3fb0d5 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -910,7 +910,7 @@ static int display_memberships(int argc, char *argv[], void *userdata) {
 
 static int display_services(int argc, char *argv[], void *userdata) {
         _cleanup_(table_unrefp) Table *t = NULL;
-        _cleanup_(closedirp) DIR *d = NULL;
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         d = opendir("/run/systemd/userdb/");
diff --git a/src/xdg-autostart-generator/xdg-autostart-generator.c b/src/xdg-autostart-generator/xdg-autostart-generator.c
index 918f6599ce..616c017357 100644
--- a/src/xdg-autostart-generator/xdg-autostart-generator.c
+++ b/src/xdg-autostart-generator/xdg-autostart-generator.c
@@ -95,7 +95,7 @@ static int enumerate_xdg_autostart(Hashmap *all_services) {
 }
 
 static int run(const char *dest, const char *dest_early, const char *dest_late) {
-        _cleanup_(hashmap_freep) Hashmap *all_services = NULL;
+        _cleanup_hashmap_free_ Hashmap *all_services = NULL;
         XdgAutostartService *service;
         int r;