]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
wait-online: use hashmap_free_with_destructor()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 12 Nov 2018 06:34:39 +0000 (15:34 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 12 Nov 2018 07:32:11 +0000 (16:32 +0900)
src/network/wait-online/manager.c

index 0dfe7482fc87f5d4da4292ea09a35176b5bff54a..e1ccc9ff67629f7bf224c7ffd2c25c4895e7aada 100644 (file)
@@ -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);