From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 12 Nov 2018 06:34:39 +0000 (+0900)
Subject: wait-online: use hashmap_free_with_destructor()
X-Git-Tag: v240~351^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b00878ef68bad2a40b343742d6d77b22fce37f5;p=thirdparty%2Fsystemd.git

wait-online: use hashmap_free_with_destructor()
---

diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index 0dfe7482fc8..e1ccc9ff676 100644
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -292,14 +292,10 @@ int manager_new(Manager **ret, char **interfaces, char **ignore, usec_t timeout)
 }
 
 void manager_free(Manager *m) {
-        Link *l;
-
         if (!m)
                 return;
 
-        while ((l = hashmap_first(m->links)))
-               link_free(l);
-        hashmap_free(m->links);
+        hashmap_free_with_destructor(m->links, link_free);
         hashmap_free(m->links_by_name);
 
         sd_event_source_unref(m->network_monitor_event_source);