From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 23 Nov 2023 19:40:49 +0000 (+0200)
Subject: config: Set module parsers inside config_dump_human_init()
X-Git-Tag: 2.4.1~1298
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e72c6eaf24c19f81d61d1e42496fe545902b6ac;p=thirdparty%2Fdovecot%2Fcore.git

config: Set module parsers inside config_dump_human_init()

Deduplicates the code a bit.
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index bb5f1749ac..dd7da5b34f 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -130,7 +130,8 @@ static struct prefix_stack prefix_stack_pop(ARRAY_TYPE(prefix_stack) *stack)
 }
 
 static struct config_dump_human_context *
-config_dump_human_init(enum config_dump_scope scope)
+config_dump_human_init(enum config_dump_scope scope,
+		       struct config_filter_parser *filter_parser)
 {
 	struct config_dump_human_context *ctx;
 	enum config_dump_flags flags;
@@ -145,6 +146,8 @@ config_dump_human_init(enum config_dump_scope scope)
 	flags = CONFIG_DUMP_FLAG_DEDUPLICATE_KEYS;
 	ctx->export_ctx = config_export_init(scope, flags,
 					     config_request_get_strings, ctx);
+	config_export_set_module_parsers(ctx->export_ctx,
+					 filter_parser->module_parsers);
 	return ctx;
 }
 
@@ -640,12 +643,10 @@ config_dump_human_filter_path(enum config_dump_scope scope,
 		bool sub_hide_passwords = set_name_filter != NULL ?
 			FALSE : hide_passwords;
 
-		ctx = config_dump_human_init(scope);
+		ctx = config_dump_human_init(scope, filter_parser);
 		sub_indent = hide_key ? 0 :
 			config_dump_filter_begin(list_prefix, indent,
 						 &filter_parser->filter);
-		config_export_set_module_parsers(ctx->export_ctx,
-						 filter_parser->module_parsers);
 		str_append_str(ctx->list_prefix, list_prefix);
 		const char *filter_key =
 			!filter_parser->filter.filter_name_array ? NULL :
@@ -698,9 +699,7 @@ config_dump_human(enum config_dump_scope scope,
 
 	/* Check for the setting always even with a filter - it might be
 	   e.g. plugin/key strlist */
-	ctx = config_dump_human_init(scope);
-	config_export_set_module_parsers(ctx->export_ctx,
-					 filter_parser->module_parsers);
+	ctx = config_dump_human_init(scope, filter_parser);
 	config_dump_human_output(ctx, output, 0, setting_name_filter, NULL,
 				 hide_key, hide_passwords, NULL);
 	config_dump_human_deinit(ctx);