global: Replace most master_service_settings_parser_get_others() calls with settings_...

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 3457230e1e8bb7a6c899ebba055dbd379058e98f..1521e5d17af535b881d2b0673cc794c1665a7e3e 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -522,7 +522,6 @@ auth_settings_read(const char *service, pool_t pool,
        struct master_service_settings_input input;
        struct setting_parser_context *set_parser;
        const char *error;
-       void **sets;
 
        i_zero(&input);
        input.roots = set_roots;
@@ -537,8 +536,8 @@ auth_settings_read(const char *service, pool_t pool,
        if (!settings_parser_check(set_parser, pool, &error))
                i_unreached();
 
-       sets = master_service_settings_parser_get_others(master_service,
-                                                        set_parser);
+       struct auth_settings *set =
+               settings_parser_get_root_set(set_parser, &auth_setting_parser_info);
        settings_parser_deinit(&set_parser);
-       return sets[0];
+       return set;
 }

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index d2ecb5970449e01907a1f8cfb5f813c3dd8cb17e..ad836baaa5fb925e59f6a4db95d6546eb56df144 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -754,10 +754,8 @@ pool_t master_service_settings_detach(struct master_service *service)
 const struct master_service_settings *
 master_service_settings_get(struct master_service *service)
 {
-       void **sets;
-
-       sets = settings_parser_get_list(service->set_parser);
-       return sets[0];
+       return settings_parser_get_root_set(service->set_parser,
+               &master_service_setting_parser_info);
 }
 
 void **master_service_settings_get_others(struct master_service *service)

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 44c2e3ec5a660186c57aa875c376362ab5144e3d..3a1660a526302e745c31d0c0889dc2193c7affcd 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1227,7 +1227,6 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
        const char *const *userdb_fields, *error;
        struct auth_user_reply reply;
        const struct setting_parser_context *set_parser;
-       void **sets;
        pool_t user_pool, temp_pool;
        int ret = 1;
 
@@ -1263,9 +1262,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
                                                    ctx->default_log_prefix);
                update_log_prefix = TRUE;
        }
-       sets = master_service_settings_parser_get_others(master_service,
-                                                        set_parser);
-       user_set = sets[0];
+       user_set = settings_parser_get_root_set(set_parser,
+                                               &mail_user_setting_parser_info);
 
        if (update_log_prefix)
                mail_storage_service_set_log_prefix(ctx, user_set, NULL, input, NULL);
@@ -1342,9 +1340,8 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
 
        user->set_parser = settings_parser_dup(set_parser, user_pool);
 
-       sets = master_service_settings_parser_get_others(master_service,
-                                                        user->set_parser);
-       user->user_set = sets[0];
+       user->user_set = settings_parser_get_root_set(user->set_parser,
+                               &mail_user_setting_parser_info);
        user->ssl_set = master_service_ssl_settings_get_from_parser(user->set_parser);
        user->gid_source = "mail_gid setting";
        user->uid_source = "mail_uid setting";
@@ -1672,7 +1669,6 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
        const struct setting_parser_context *set_parser;
        const char *error;
        pool_t temp_pool;
-       void **sets;
 
        if (ctx->conn != NULL)
                return;
@@ -1682,9 +1678,8 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
                                               &user_info, &set_parser,
                                               &error) < 0)
                i_fatal("%s", error);
-       sets = master_service_settings_parser_get_others(master_service,
-                                                        set_parser);
-       user_set = sets[0];
+       user_set = settings_parser_get_root_set(set_parser,
+                                               &mail_user_setting_parser_info);
 
        mail_storage_service_first_init(ctx, user_info, user_set, ctx->flags);
        pool_unref(&temp_pool);

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index 1d9ecb25468a01fb87e65197afb8f3fd582767fb..bc8a69fd2b643331257159698337a43e8363987e 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -193,13 +193,19 @@ void lmtp_settings_dup(const struct setting_parser_context *set_parser,
                       struct lda_settings **lda_set_r)
 {
        const char *error;
-       void **sets;
 
-       sets = master_service_settings_parser_get_others(master_service,
-                                                        set_parser);
-       *user_set_r = settings_dup(&mail_user_setting_parser_info, sets[0], pool);
-       *lda_set_r = settings_dup(&lda_setting_parser_info, sets[2], pool);
-       *lmtp_set_r = settings_dup(&lmtp_setting_parser_info, sets[3], pool);
+       *user_set_r = settings_parser_get_root_set(set_parser,
+                               &mail_user_setting_parser_info);
+       *user_set_r = settings_dup(&mail_user_setting_parser_info,
+                                  *user_set_r, pool);
+       *lda_set_r = settings_parser_get_root_set(set_parser,
+                               &lda_setting_parser_info);
+       *lda_set_r = settings_dup(&lda_setting_parser_info,
+                                 *lda_set_r, pool);
+       *lmtp_set_r = settings_parser_get_root_set(set_parser,
+                               &lmtp_setting_parser_info);
+       *lmtp_set_r = settings_dup(&lmtp_setting_parser_info,
+                                  *lmtp_set_r, pool);
        if (!lmtp_settings_check(*lmtp_set_r, pool, &error))
                i_unreached();
 }

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 54ec0c0da70c44e5eca39292743e6cfddca98746..32b87d05085df6f603e8c2f858e5506f7c987ea8 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -306,8 +306,8 @@ static void main_init(void)
                                               &user_info, &set_parser,
                                               &error) < 0)
                i_fatal("%s", error);
-       user_set = master_service_settings_parser_get_others(master_service,
-                                                            set_parser)[0];
+       user_set = settings_parser_get_root_set(set_parser,
+                       &mail_user_setting_parser_info);
        set = master_service_settings_get_others(master_service)[1];
 
        quota_status_settings = settings_dup(&quota_status_setting_parser_info, set,