From eb370ad9065ce222c1bfd6ae0576b9a0f6b3de22 Mon Sep 17 00:00:00 2001 From: Federico Angelilli Date: Wed, 20 Nov 2024 11:13:57 +0100 Subject: Refactor block initialization --- src/blocks/script.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/blocks/script.c') diff --git a/src/blocks/script.c b/src/blocks/script.c index 08ed9e3..51e5328 100644 --- a/src/blocks/script.c +++ b/src/blocks/script.c @@ -43,13 +43,12 @@ static void block_script_update(block_t *block) assert(script->block.text != NULL); } -static block_t *block_script_alloc(const block_scheme_t *scheme) +static void block_script_init(block_t *block, const block_scheme_t *scheme) { - block_t *block = calloc(1, sizeof(block_script_t)); - block->type = BLOCK_TEXT; + extern const block_scheme_t block_text_scheme; + block_text_scheme.init_fn(block, scheme); block->update_interval = block_script_interval; block->update_fn = block_script_update; - return block; } static void block_script_clean(block_t *block) @@ -81,7 +80,8 @@ static const config_entry_t block_script_entries[] = { const block_scheme_t block_script_scheme = { .name = "script", .entries = block_script_entries, - .alloc_fn = block_script_alloc, + .size = sizeof(block_script_t), + .init_fn = block_script_init, .clean_fn = block_script_clean, .validate_fn = block_script_validate, }; -- cgit v1.2.3