diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-28 12:35:49 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-11-28 21:30:30 +0100 |
| commit | 224b0e7ad0116579f830b7dd387b97c3facb65d9 (patch) | |
| tree | d769049843011ec955d86af31e2f0d62c4521f38 /src/sysv-generator | |
| parent | ec1d290903538df3183dac2771b5db429b6f7688 (diff) | |
| download | systemd-224b0e7ad0116579f830b7dd387b97c3facb65d9.tar.gz | |
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.
Diffstat (limited to 'src/sysv-generator')
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 7 |
1 files changed, 1 insertions, 6 deletions
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) { |