From ec1d290903538df3183dac2771b5db429b6f7688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 28 Nov 2017 12:31:27 +0100 Subject: [PATCH] Use hashmap_free_free where appropriate --- src/journal/sd-journal.c | 5 +---- src/test/test-mount-util.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 0b6698782d..59ddc73e88 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1978,7 +1978,6 @@ fail: _public_ void sd_journal_close(sd_journal *j) { Directory *d; JournalFile *f; - char *p; if (!j) return; @@ -2006,9 +2005,7 @@ _public_ void sd_journal_close(sd_journal *j) { mmap_cache_unref(j->mmap); } - while ((p = hashmap_steal_first(j->errors))) - free(p); - hashmap_free(j->errors); + hashmap_free_free(j->errors); free(j->path); free(j->prefix); diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index 9582d6ceec..2aad7f387c 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -97,10 +97,7 @@ static void test_mnt_id(void) { assert_se(path_equal_ptr(hashmap_get(h, INT_TO_PTR(mnt_id2)), p)); } - while ((p = hashmap_steal_first(h))) - free(p); - - hashmap_free(h); + hashmap_free_free(h); } int main(int argc, char *argv[]) {