From 224b0e7ad0116579f830b7dd387b97c3facb65d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 28 Nov 2017 12:35:49 +0100 Subject: Add set/hashmap helpers for non-trivial freeing and use where straighforward A macro is needed because otherwise we couldn't ensure type safety. Some simple tests are included. No functional change intended. --- src/sysv-generator/sysv-generator.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/sysv-generator') diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index cfb34c8f0b..f59c277e13 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -95,12 +95,7 @@ static void free_sysvstub(SysvStub *s) { DEFINE_TRIVIAL_CLEANUP_FUNC(SysvStub*, free_sysvstub); static void free_sysvstub_hashmapp(Hashmap **h) { - SysvStub *stub; - - while ((stub = hashmap_steal_first(*h))) - free_sysvstub(stub); - - hashmap_free(*h); + hashmap_free_with_destructor(*h, free_sysvstub); } static int add_alias(const char *service, const char *alias) { -- cgit v1.2.1