lib-storage: Replace mail_user_set_get_driver_settings() with settings_parser_get_roo...

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index e5a4a62df1ebb5d324b5b740705256919489c903..3b9f45552dcb26e5b0cdbda13a2967b232ec01fd 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -31,6 +31,7 @@
 #include "lib.h"
 #include "ioloop.h"
 #include "str.h"
+#include "settings-parser.h"
 #include "imap-arg.h"
 #include "imap-match.h"
 #include "imap-utf7.h"
@@ -94,10 +95,8 @@ static int imapc_list_init(struct mailbox_list *_list, const char **error_r)
 {
        struct imapc_mailbox_list *list = (struct imapc_mailbox_list *)_list;
 
-       list->set = mail_user_set_get_driver_settings(_list->ns->user->set_parser,
-                                                     _list->ns->user->set_info,
-                                                     _list->ns->user_set,
-                                                     imapc_get_setting_parser_info());
+       list->set = settings_parser_get_root_set(_list->ns->user->set_parser,
+                                                imapc_get_setting_parser_info());
        if (imapc_storage_client_create(_list->ns, list->set, _list->mail_set,
                                        &list->client, error_r) < 0)
                return -1;

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 97954c1418bd81cf18156f106518e90d36cc8963..1b73b30e44e2a35930e129cc92a8400140561dff 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -96,8 +96,8 @@ int mail_namespace_alloc(struct mail_user *user,
        ns->prefix = i_strdup(ns_set->prefix);
        ns->set = ns_set;
        ns->user_set = user_all_settings;
-       ns->mail_set = mail_user_set_get_driver_settings(user->set_parser,
-               user->set_info, ns->user_set, &mail_storage_setting_parser_info);
+       ns->mail_set = settings_parser_get_root_set(user->set_parser,
+                                                   &mail_storage_setting_parser_info);
        i_array_init(&ns->all_storages, 2);
 
        if (strcmp(ns_set->type, "private") == 0) {

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index c2e5179af20abb10456903dfa1284859a5a9780d..2d08387a080fb5e8b2b66345ff67f93e7006ad41 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -108,14 +108,12 @@ mail_storage_service_var_expand(struct mail_storage_service_ctx *ctx,
                                const char **error_r);
 
 static bool
-mail_user_set_get_mail_debug(const struct setting_parser_context *set_parser,
-                            const struct setting_parser_info *user_info,
-                            const struct mail_user_settings *user_set)
+mail_user_set_get_mail_debug(const struct setting_parser_context *set_parser)
 {
        const struct mail_storage_settings *mail_set;
 
-       mail_set = mail_user_set_get_driver_settings(set_parser, user_info,
-                       user_set, &mail_storage_setting_parser_info);
+       mail_set = settings_parser_get_root_set(set_parser,
+                       &mail_storage_setting_parser_info);
        return mail_set->mail_debug;
 }
 
@@ -1156,13 +1154,12 @@ void mail_storage_service_set_auth_conn(struct mail_storage_service_ctx *ctx,
 static void
 mail_storage_service_first_init(struct mail_storage_service_ctx *ctx,
                                const struct setting_parser_context *set_parser,
-                               const struct setting_parser_info *user_info,
                                const struct mail_user_settings *user_set,
                                enum mail_storage_service_flags service_flags)
 {
        enum auth_master_flags flags = 0;
 
-       ctx->debug = mail_user_set_get_mail_debug(set_parser, user_info, user_set) ||
+       ctx->debug = mail_user_set_get_mail_debug(set_parser) ||
                     (service_flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0;
        if (ctx->debug)
                flags |= AUTH_MASTER_FLAG_DEBUG;
@@ -1175,7 +1172,6 @@ mail_storage_service_first_init(struct mail_storage_service_ctx *ctx,
 static int
 mail_storage_service_load_modules(struct mail_storage_service_ctx *ctx,
                                  const struct setting_parser_context *set_parser,
-                                 const struct setting_parser_info *user_info,
                                  const struct mail_user_settings *user_set,
                                  const char **error_r)
 {
@@ -1191,7 +1187,7 @@ mail_storage_service_load_modules(struct mail_storage_service_ctx *ctx,
        mod_set.binary_name = master_service_get_name(ctx->service);
        mod_set.setting_name = "mail_plugins";
        mod_set.require_init_funcs = TRUE;
-       mod_set.debug = mail_user_set_get_mail_debug(set_parser, user_info, user_set);
+       mod_set.debug = mail_user_set_get_mail_debug(set_parser);
 
        return module_dir_try_load_missing(&mail_storage_service_modules,
                                           user_set->mail_plugin_dir,
@@ -1305,9 +1301,9 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
                mail_storage_service_set_log_prefix(ctx, user_set, NULL, input, NULL);
 
        if (ctx->conn == NULL)
-               mail_storage_service_first_init(ctx, set_parser, user_info, user_set, flags);
+               mail_storage_service_first_init(ctx, set_parser, user_set, flags);
        /* load global plugins */
-       if (mail_storage_service_load_modules(ctx, set_parser, user_info, user_set, error_r) < 0) {
+       if (mail_storage_service_load_modules(ctx, set_parser, user_set, error_r) < 0) {
                pool_unref(&user_pool);
                return -1;
        }
@@ -1416,7 +1412,6 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
        /* load per-user plugins */
        if (ret > 0) {
                if (mail_storage_service_load_modules(ctx, user->set_parser,
-                                                     user_info,
                                                      user->user_set,
                                                      error_r) < 0) {
                        ret = -2;
@@ -1719,7 +1714,7 @@ void mail_storage_service_init_settings(struct mail_storage_service_ctx *ctx,
        user_set = settings_parser_get_root_set(set_parser,
                                                &mail_user_setting_parser_info);
 
-       mail_storage_service_first_init(ctx, set_parser, user_info, user_set, ctx->flags);
+       mail_storage_service_first_init(ctx, set_parser, user_set, ctx->flags);
        pool_unref(&temp_pool);
 }
 
@@ -1802,8 +1797,7 @@ void *mail_storage_service_user_get_set(struct mail_storage_service_user *user,
 const struct mail_storage_settings *
 mail_storage_service_user_get_mail_set(struct mail_storage_service_user *user)
 {
-       return mail_user_set_get_driver_settings(user->set_parser,
-                               user->user_info, user->user_set,
+       return settings_parser_get_root_set(user->set_parser,
                                &mail_storage_setting_parser_info);
 }
 

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 1ee4460db9d8c8ccfdbd1d808bc39563654d2990..e6671e7a91a53b90c97d4ef960304ada830f003f 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -348,20 +348,10 @@ const struct setting_parser_info mail_user_setting_parser_info = {
 #endif
 };
 
-const void *
-mail_user_set_get_driver_settings(const struct setting_parser_context *set_parser,
-                                 const struct setting_parser_info *base_info ATTR_UNUSED,
-                                 const struct mail_user_settings *set ATTR_UNUSED,
-                                 const struct setting_parser_info *info)
-{
-       return settings_parser_get_root_set(set_parser, info);
-}
-
 const struct mail_storage_settings *
 mail_user_set_get_storage_set(struct mail_user *user)
 {
-       return mail_user_set_get_driver_settings(user->set_parser,
-                                                user->set_info, user->set,
+       return settings_parser_get_root_set(user->set_parser,
                &mail_storage_setting_parser_info);
 }
 

diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index 29097cda1a5ba873fcf0fefcafd27c97676d28aa..8f71a969e90f683540ab841f56203a3f93caa09a 100644 (file)
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -154,12 +154,6 @@ extern const struct mailbox_settings mailbox_default_settings;
 
 struct ssl_iostream_settings;
 
-const void *
-mail_user_set_get_driver_settings(const struct setting_parser_context *set_parser,
-                                 const struct setting_parser_info *base_info,
-                                 const struct mail_user_settings *set,
-                                 const struct setting_parser_info *info);
-
 const struct mail_storage_settings *
 mail_user_set_get_storage_set(struct mail_user *user);