From 536db672b401d472d8b1ec8e05a2128923bfa7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 19 Dec 2018 18:57:19 +0100 Subject: [PATCH] module/i3: use module common constructor/destructor --- modules/i3/i3.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/i3/i3.c b/modules/i3/i3.c index ef2deae..34617a8 100644 --- a/modules/i3/i3.c +++ b/modules/i3/i3.c @@ -393,7 +393,7 @@ destroy(struct module *mod) mtx_destroy(&m->lock); free(m); - free(mod); + module_default_destroy(mod); } static struct exposable * @@ -472,14 +472,10 @@ module_i3(struct i3_workspaces workspaces[], size_t workspace_count, m->workspaces.v = NULL; m->workspaces.count = 0; - 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; }