lib-master, global: master_service_settings_cache_read() - Remove "const" from settin...

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 7fa6ac66de8e3e2dfd30fc380f683a7a9d0cab36..c63e30abd8fb85ea8467e8c08ded6f48d3d3cb03 100644 (file)
--- 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 238fa636d564f10fd38ece4a623be0205b5f6b08..973d1d24cb70d5a87131eec51d517d8d2a9aa006 100644 (file)
--- 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 64b6971bb87dea4f46e224d137cc20a317cb7756..0b988acc1c357e572b6fa99f4a0f58489ceabe0f 100644 (file)
--- 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 b573341fb5a4f91ff80f6b4c20c75862f38cd59c..1072fd11ca7e1f6ac4fca22f56639815504001e3 100644 (file)
--- 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 905bac67d4486205508500bff208b40a023151c9..64de67f085d7f8cae7f7a2f3ac2e9f02f7841c3f 100644 (file)
--- 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;