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

sd-journal: use hash ops with destructor
---

diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
index 858aeca45ef..83f77206c31 100644
--- a/src/libsystemd/sd-journal/sd-journal.c
+++ b/src/libsystemd/sd-journal/sd-journal.c
@@ -83,7 +83,7 @@ static int journal_put_error(sd_journal *j, int r, const char *path) {
                         return -ENOMEM;
         }
 
-        r = hashmap_ensure_put(&j->errors, NULL, INT_TO_PTR(r), copy);
+        r = hashmap_ensure_put(&j->errors, &trivial_hash_ops_value_free, INT_TO_PTR(r), copy);
         if (r == -EEXIST)
                 return 0;
         if (r < 0)
@@ -2560,7 +2560,7 @@ _public_ void sd_journal_close(sd_journal *j) {
         if (j->mmap)
                 mmap_cache_unref(j->mmap);
 
-        hashmap_free_free(j->errors);
+        hashmap_free(j->errors);
 
         set_free(j->exclude_syslog_identifiers);