global: Replace settings_parser_deinit() with settings_parser_unref()

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 1521e5d17af535b881d2b0673cc794c1665a7e3e..74e2e40e7751ca074cce2aaa43295e392e5ee19b 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -538,6 +538,6 @@ auth_settings_read(const char *service, pool_t pool,
 
        struct auth_settings *set =
                settings_parser_get_root_set(set_parser, &auth_setting_parser_info);
-       settings_parser_deinit(&set_parser);
+       settings_parser_unref(&set_parser);
        return set;
 }

diff --git a/src/config/config-filter.c b/src/config/config-filter.c
index 336380d5470c2443ab99209f3ee2e3ed1d0d2070..cc6dd60e93d9022c52b8cdf10a7305d86a1a9657 100644 (file)
--- a/src/config/config-filter.c
+++ b/src/config/config-filter.c
@@ -397,5 +397,5 @@ void config_filter_parsers_free(struct config_module_parser *parsers)
        unsigned int i;
 
        for (i = 0; parsers[i].root != NULL; i++)
-               settings_parser_deinit(&parsers[i].parser);
+               settings_parser_unref(&parsers[i].parser);
 }

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index ec5843f5564927b7c36d477515c0aa7e29ebf8c6..7fa6ac66de8e3e2dfd30fc380f683a7a9d0cab36 100644 (file)
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -186,13 +186,13 @@ void master_service_settings_cache_deinit(struct master_service_settings_cache *
        for (entry = cache->oldest; entry != NULL; entry = next) {
                next = entry->next;
                i_assert(entry->parser != cache->global_parser);
-               settings_parser_deinit(&entry->parser);
+               settings_parser_unref(&entry->parser);
                pool_unref(&entry->pool);
        }
        hash_table_destroy(&cache->local_name_hash);
        hash_table_destroy(&cache->local_ip_hash);
        if (cache->global_parser != NULL)
-               settings_parser_deinit(&cache->global_parser);
+               settings_parser_unref(&cache->global_parser);
        pool_unref(&cache->pool);
 }
 
@@ -269,7 +269,7 @@ setting_entry_detach(struct master_service_settings_cache *cache,
                hash_table_remove(cache->local_name_hash, entry->local_name);
        else if (entry->local_ip.family != 0)
                hash_table_remove(cache->local_ip_hash, &entry->local_ip);
-       settings_parser_deinit(&entry->parser);
+       settings_parser_unref(&entry->parser);
 }
 
 static struct setting_parser_context *

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 601b0ac216cdd0caafb106057e3ec7e3948540ce..2f75197f0a729ae35f6c42307582cc629c1ab4e7 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -606,7 +606,7 @@ int master_service_settings_read(struct master_service *service,
 
        if (service->set_pool != NULL) {
                if (service->set_parser != NULL)
-                       settings_parser_deinit(&service->set_parser);
+                       settings_parser_unref(&service->set_parser);
                p_clear(service->set_pool);
        } else {
                service->set_pool =
@@ -665,7 +665,7 @@ int master_service_settings_read(struct master_service *service,
                        }
                        i_close_fd(&fd);
                        config_exec_fallback(service, input, error_r);
-                       settings_parser_deinit(&parser);
+                       settings_parser_unref(&parser);
                        return -1;
                }
 
@@ -682,7 +682,7 @@ int master_service_settings_read(struct master_service *service,
        if (use_environment || service->keep_environment) {
                if (settings_parse_environ(parser) < 0) {
                        *error_r = t_strdup(settings_parser_get_error(parser));
-                       settings_parser_deinit(&parser);
+                       settings_parser_unref(&parser);
                        return -1;
                }
        }
@@ -690,14 +690,14 @@ int master_service_settings_read(struct master_service *service,
        if (array_is_created(&service->config_overrides)) {
                if (master_service_apply_config_overrides(service, parser,
                                                          error_r) < 0) {
-                       settings_parser_deinit(&parser);
+                       settings_parser_unref(&parser);
                        return -1;
                }
        }
 
        if (!settings_parser_check(parser, service->set_pool, &error)) {
                *error_r = t_strdup_printf("Invalid settings: %s", error);
-               settings_parser_deinit(&parser);
+               settings_parser_unref(&parser);
                return -1;
        }
 
@@ -745,7 +745,7 @@ pool_t master_service_settings_detach(struct master_service *service)
 {
        pool_t pool = service->set_pool;
 
-       settings_parser_deinit(&service->set_parser);
+       settings_parser_unref(&service->set_parser);
        service->set_pool = NULL;
        return pool;
 }

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 9d2307bf3ffdf4e532590e8db069cb3807b7b98e..61da738126323b320243018ef23142fefef0df3b 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -1493,7 +1493,7 @@ static void master_service_deinit_real(struct master_service **_service)
                array_free(&service->config_overrides);
 
        if (service->set_parser != NULL) {
-               settings_parser_deinit(&service->set_parser);
+               settings_parser_unref(&service->set_parser);
                pool_unref(&service->set_pool);
        }
        i_free(master_service_category_name);

diff --git a/src/lib-master/test-master-service-settings-cache.c b/src/lib-master/test-master-service-settings-cache.c
index 509cee8d64174dbde3d21fdaae5b8cac33ee22f5..64b6971bb87dea4f46e224d137cc20a317cb7756 100644 (file)
--- a/src/lib-master/test-master-service-settings-cache.c
+++ b/src/lib-master/test-master-service-settings-cache.c
@@ -119,7 +119,7 @@ int main(void)
                settings_parser_init(pool, &test_setting_parser_info, 0);
        master_service = &test_master_service;
        ret = test_run(test_functions);
-       settings_parser_deinit(&test_master_service.set_parser);
+       settings_parser_unref(&test_master_service.set_parser);
        pool_unref(&pool);
        return ret;
 }

diff --git a/src/lib-settings/test-settings-parser.c b/src/lib-settings/test-settings-parser.c
index d16b263fe1a91bb8c1c0b1dced32f167e5859a40..81ccb8b33b92dfc4ebf404c0d6f998e0b2452e2d 100644 (file)
--- a/src/lib-settings/test-settings-parser.c
+++ b/src/lib-settings/test-settings-parser.c
@@ -130,7 +130,7 @@ static void test_settings_parser_get(void)
        /* check that the setting got expanded */
        test_assert_strcmp(settings->expand_str, "test value");
 
-       settings_parser_deinit(&ctx);
+       settings_parser_unref(&ctx);
        pool_unref(&pool);
        test_end();
 }

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 0179164138a876b70148dd4a32a0273180d69235..b573341fb5a4f91ff80f6b4c20c75862f38cd59c 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1672,7 +1672,7 @@ void mail_storage_service_user_unref(struct mail_storage_service_user **_user)
        if (user->master_service_user_set)
                master_service_set_current_user(master_service, NULL);
 
-       settings_parser_deinit(&user->set_parser);
+       settings_parser_unref(&user->set_parser);
        event_unref(&user->event);
        pool_unref(&user->pool);
 }

diff --git a/src/stats/test-stats-common.c b/src/stats/test-stats-common.c
index 3e307a9e586e3280d91729f44ecb98a873d2245b..de8185e51d8176339994d8c95742ac6be34b8224 100644 (file)
--- a/src/stats/test-stats-common.c
+++ b/src/stats/test-stats-common.c
@@ -32,7 +32,7 @@ static struct stats_settings *read_settings(const char *settings)
                i_fatal("Failed to parse settings: %s",
                        error);
        struct stats_settings *set = settings_parser_get(ctx);
-       settings_parser_deinit(&ctx);
+       settings_parser_unref(&ctx);
        i_stream_unref(&is);
        return set;
 }