From bfea1e5a34aedca7ed04b028298cccc731622a40 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 10 Feb 2025 10:13:24 +0200 Subject: [PATCH] lib-settings: Rename DEVEL_CHECKS ifdefs to DEBUG --- src/lib-settings/settings.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c index 5eaf5a3933..dde9251701 100644 --- a/src/lib-settings/settings.c +++ b/src/lib-settings/settings.c @@ -1439,13 +1439,11 @@ settings_var_expand_init_add(struct settings_var_expand_init_ctx *init_ctx, i_assert(count == need_contexts); } -#ifdef DEVEL_CHECKS /* ensure everything is still good */ - unsigned int num_tables = array_size(¶ms->tables_arr); - unsigned int num_provs = array_size(¶ms->providers_arr); - unsigned int num_ctx = array_size(¶ms->contexts); + unsigned int num_tables = array_count(&init_ctx->tables); + unsigned int num_provs = array_count(&init_ctx->providers); + unsigned int num_ctx = array_count(&init_ctx->contexts); i_assert(I_MAX(num_tables, num_provs) == num_ctx); -#endif } static void @@ -1479,13 +1477,11 @@ settings_var_expand_init(struct settings_apply_ctx *ctx) event = event_get_parent(event); } -#ifdef DEVEL_CHECKS /* ensure everything is still good */ - unsigned int num_tables = array_size(¶ms->tables_arr); - unsigned int num_provs = array_size(¶ms->providers_arr); - unsigned int num_ctx = array_size(¶ms->contexts); + unsigned int num_tables = array_count(&init_ctx.tables); + unsigned int num_provs = array_count(&init_ctx.providers); + unsigned int num_ctx = array_count(&init_ctx.contexts); i_assert(I_MAX(num_tables, num_provs) == num_ctx); -#endif array_append_zero(&init_ctx.tables); array_append_zero(&init_ctx.providers); -- 2.47.3