From 20cb0f0de7aee6ec703c073b18ebdf835d05df87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 19 Dec 2018 18:58:10 +0100 Subject: [PATCH] module/label: use module common constructor/destructor --- modules/label/label.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/label/label.c b/modules/label/label.c index df71c62..afc0b6b 100644 --- a/modules/label/label.c +++ b/modules/label/label.c @@ -15,7 +15,7 @@ destroy(struct module *mod) struct private *m = mod->private; m->label->destroy(m->label); free(m); - free(mod); + module_default_destroy(mod); } static struct exposable * @@ -37,15 +37,10 @@ module_label(struct particle *label) struct private *m = malloc(sizeof(*m)); m->label = label; - struct module *mod = malloc(sizeof(*mod)); - mod->bar = NULL; + struct module *mod = module_common_new(); mod->private = m; mod->run = &run; mod->destroy = &destroy; mod->content = &content; - mod->begin_expose = &module_default_begin_expose; - mod->expose = &module_default_expose; - mod->end_expose = &module_default_end_expose; - return mod; }