Refactor

1 files changed, 5 insertions, 4 deletions

diff --git a/src/config.c b/src/config.c
index 5855109..ce34e55 100644
--- a/src/config.c
+++ b/src/config.c
@@ -422,10 +422,11 @@ static block_t *config_alloc_block(config_t *config, const block_scheme_t *schem
 
     block_t *block = config->blocks[config->n_blocks - 1] = calloc(1, scheme->size);
     assert(block != NULL);
-    scheme->init_fn(block, scheme);
 
     block->label = label;
     block->scheme = scheme;
+    scheme->init_fn(block);
+
     return block;
 }
 
@@ -603,9 +604,9 @@ int config_validate(config_t *config)
         if (scheme->validate_fn == NULL) continue;
         log_debug("Validating 'block.%s'", block->label);
 
-        int t = scheme->validate_fn(block, scheme);
-        errors += t;
-        block->validated = t == 0;
+        int tmp = scheme->validate_fn(block);
+        errors += tmp;
+        block->validated = tmp == 0;
     }
 
     return errors;