From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 22 Jan 2025 01:51:13 +0000 (+0900)
Subject: remount-fs: use hash ops with destructor
X-Git-Tag: v258-rc1~1512^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06835cb397069e77043d34002cc3324c1f1184c8;p=thirdparty%2Fsystemd.git

remount-fs: use hash ops with destructor
---

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 37c7b389b4c..21167a7b4ae 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -34,7 +34,7 @@ static int track_pid(Hashmap **h, const char *path, pid_t pid) {
         if (!c)
                 return log_oom();
 
-        r = hashmap_ensure_put(h, NULL, PID_TO_PTR(pid), c);
+        r = hashmap_ensure_put(h, &trivial_hash_ops_value_free, PID_TO_PTR(pid), c);
         if (r == -ENOMEM)
                 return log_oom();
         if (r < 0)
@@ -70,7 +70,7 @@ static int do_remount(const char *path, bool force_rw, Hashmap **pids) {
 }
 
 static int remount_by_fstab(Hashmap **ret_pids) {
-        _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
+        _cleanup_hashmap_free_ Hashmap *pids = NULL;
         _cleanup_endmntent_ FILE *f = NULL;
         bool has_root = false;
         struct mntent* me;
@@ -108,7 +108,7 @@ static int remount_by_fstab(Hashmap **ret_pids) {
 }
 
 static int run(int argc, char *argv[]) {
-        _cleanup_hashmap_free_free_ Hashmap *pids = NULL;
+        _cleanup_hashmap_free_ Hashmap *pids = NULL;
         int r;
 
         log_setup();