From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 2 Dec 2022 12:50:47 +0000 (+0200)
Subject: lib-master, global: master_service_settings_cache_read() - Remove "const" from settin... 
X-Git-Tag: 2.4.0~3318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2823fc38d9f2729725be9209c8ce0871700663c;p=thirdparty%2Fdovecot%2Fcore.git

lib-master, global: master_service_settings_cache_read() - Remove "const" from settings parser return value
---

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 7fa6ac66de..c63e30abd8 100644
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -214,7 +214,7 @@ cache_can_return_global(struct master_service_settings_cache *cache,
 static bool
 cache_find(struct master_service_settings_cache *cache,
 	   const struct master_service_settings_input *input,
-	   const struct setting_parser_context **parser_r)
+	   struct setting_parser_context **parser_r)
 {
 	struct settings_entry *entry = NULL;
 
@@ -358,7 +358,7 @@ cache_add(struct master_service_settings_cache *cache,
 
 int master_service_settings_cache_read(struct master_service_settings_cache *cache,
 				       const struct master_service_settings_input *input,
-				       const struct setting_parser_context **parser_r,
+				       struct setting_parser_context **parser_r,
 				       const char **error_r)
 {
 	struct master_service_settings_output output;
diff --git a/src/lib-master/master-service-settings-cache.h b/src/lib-master/master-service-settings-cache.h
index 238fa636d5..973d1d24cb 100644
--- a/src/lib-master/master-service-settings-cache.h
+++ b/src/lib-master/master-service-settings-cache.h
@@ -9,7 +9,7 @@ void master_service_settings_cache_deinit(struct master_service_settings_cache *
 int master_service_settings_cache_init_filter(struct master_service_settings_cache *cache);
 int master_service_settings_cache_read(struct master_service_settings_cache *cache,
 				       const struct master_service_settings_input *input,
-				       const struct setting_parser_context **parser_r,
+				       struct setting_parser_context **parser_r,
 				       const char **error_r) ATTR_NULL(3);
 
 #endif
diff --git a/src/lib-master/test-master-service-settings-cache.c b/src/lib-master/test-master-service-settings-cache.c
index 64b6971bb8..0b988acc1c 100644
--- a/src/lib-master/test-master-service-settings-cache.c
+++ b/src/lib-master/test-master-service-settings-cache.c
@@ -69,7 +69,7 @@ master_service_settings_get(struct master_service *service ATTR_UNUSED)
 
 static void test_master_service_settings_cache_once(void)
 {
-	const struct setting_parser_context *parser;
+	struct setting_parser_context *parser;
 	const char *error;
 
 	output.used_local = output.service_uses_local && i_rand_limit(2) != 0;
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index b573341fb5..1072fd11ca 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1106,13 +1106,15 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 	if (null_strcmp(set_input.module, ctx->set_cache_module) == 0 &&
 	    null_strcmp(set_input.service, ctx->set_cache_service) == 0 &&
 	    ctx->set_cache != NULL) {
+		struct setting_parser_context *parser;
 		if (master_service_settings_cache_read(ctx->set_cache,
 						       &set_input,
-						       parser_r, error_r) < 0) {
+						       &parser, error_r) < 0) {
 			*error_r = t_strdup_printf(
 				"Error reading configuration: %s", *error_r);
 			return -1;
 		}
+		*parser_r = parser;
 	} else {
 		if (master_service_settings_read(ctx->service, &set_input,
 						 &set_output, error_r) < 0) {
diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index 905bac67d4..64de67f085 100644
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -169,7 +169,7 @@ login_settings_read(pool_t pool,
 {
 	struct master_service_settings_input input;
 	const char *error;
-	const struct setting_parser_context *parser;
+	struct setting_parser_context *parser;
 	void **sets;
 	unsigned int i, count;