From: Timo Sirainen Date: Tue, 15 Nov 2022 22:51:11 +0000 (+0200) Subject: lib-storage: Replace mail_namespace_get_driver_settings() with settings_parser_get_ro... X-Git-Tag: 2.4.0~3333 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7231eec33d770ea2377af580b90916e100d69e9b;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Replace mail_namespace_get_driver_settings() with settings_parser_get_root_set() --- diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c index b7fc6b3c17..edaa236016 100644 --- a/src/lib-storage/index/dbox-multi/mdbox-storage.c +++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c @@ -5,6 +5,7 @@ #include "ioloop.h" #include "mkdir-parents.h" #include "master-service.h" +#include "settings-parser.h" #include "mail-index-modseq.h" #include "mail-index-alloc-cache.h" #include "mailbox-log.h" @@ -45,7 +46,8 @@ int mdbox_storage_create(struct mail_storage *_storage, struct mdbox_storage *storage = MDBOX_STORAGE(_storage); const char *dir; - storage->set = mail_namespace_get_driver_settings(ns, _storage); + storage->set = settings_parser_get_root_set(_storage->user->set_parser, + mdbox_get_setting_parser_info()); storage->preallocate_space = storage->set->mdbox_preallocate_space; if (*ns->list->set.mailbox_dir_name == '\0') { diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c index 53db829c96..7e748aa4a3 100644 --- a/src/lib-storage/index/imapc/imapc-storage.c +++ b/src/lib-storage/index/imapc/imapc-storage.c @@ -3,6 +3,7 @@ #include "lib.h" #include "ioloop.h" #include "str.h" +#include "settings-parser.h" #include "imap-arg.h" #include "imap-resp-code.h" #include "mailbox-tree.h" @@ -414,7 +415,8 @@ imapc_storage_create(struct mail_storage *_storage, struct imapc_storage *storage = IMAPC_STORAGE(_storage); struct imapc_mailbox_list *imapc_list = NULL; - storage->set = mail_namespace_get_driver_settings(ns, _storage); + storage->set = settings_parser_get_root_set(_storage->user->set_parser, + imapc_get_setting_parser_info()); /* serialize all the settings */ _storage->unique_root_dir = p_strdup_printf(_storage->pool, diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c index c6a69729e2..fdaa2bd7d5 100644 --- a/src/lib-storage/index/maildir/maildir-storage.c +++ b/src/lib-storage/index/maildir/maildir-storage.c @@ -5,6 +5,7 @@ #include "mkdir-parents.h" #include "eacces-error.h" #include "unlink-old-files.h" +#include "settings-parser.h" #include "mailbox-uidvalidity.h" #include "mailbox-list-private.h" #include "maildir-storage.h" @@ -56,7 +57,8 @@ maildir_storage_create(struct mail_storage *_storage, struct mail_namespace *ns, struct mailbox_list *list = ns->list; const char *dir; - storage->set = mail_namespace_get_driver_settings(ns, _storage); + storage->set = settings_parser_get_root_set(_storage->user->set_parser, + maildir_get_setting_parser_info()); storage->temp_prefix = p_strdup(_storage->pool, mailbox_list_get_temp_prefix(list)); @@ -612,7 +614,8 @@ static void maildir_storage_add_list(struct mail_storage *storage, mlist = p_new(list->pool, struct maildir_mailbox_list_context, 1); mlist->module_ctx.super = list->v; - mlist->set = mail_namespace_get_driver_settings(list->ns, storage); + mlist->set = settings_parser_get_root_set(storage->user->set_parser, + maildir_get_setting_parser_info()); list->v.is_internal_name = maildir_is_internal_name; MODULE_CONTEXT_SET(list, maildir_mailbox_list_module, mlist); diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c index 0e7be1fafa..4e891ae205 100644 --- a/src/lib-storage/index/mbox/mbox-storage.c +++ b/src/lib-storage/index/mbox/mbox-storage.c @@ -6,6 +6,7 @@ #include "ostream.h" #include "restrict-access.h" #include "master-service.h" +#include "settings-parser.h" #include "mailbox-list-private.h" #include "mbox-storage.h" #include "mbox-lock.h" @@ -182,7 +183,8 @@ mbox_storage_create(struct mail_storage *_storage, struct mail_namespace *ns, return -1; } - storage->set = mail_namespace_get_driver_settings(ns, _storage); + storage->set = settings_parser_get_root_set(_storage->user->set_parser, + mbox_get_setting_parser_info()); if (mailbox_list_get_root_path(ns->list, MAILBOX_LIST_PATH_TYPE_INDEX, &dir)) { _storage->temp_path_prefix = p_strconcat(_storage->pool, dir, @@ -715,7 +717,8 @@ static void mbox_storage_add_list(struct mail_storage *storage, mlist = p_new(list->pool, struct mbox_mailbox_list, 1); mlist->module_ctx.super = list->v; - mlist->set = mail_namespace_get_driver_settings(list->ns, storage); + mlist->set = settings_parser_get_root_set(storage->user->set_parser, + mbox_get_setting_parser_info()); if (*list->set.maildir_name == '\0') { /* have to use .imap/ directories */ diff --git a/src/lib-storage/index/pop3c/pop3c-storage.c b/src/lib-storage/index/pop3c/pop3c-storage.c index 69a3533471..da13f880bb 100644 --- a/src/lib-storage/index/pop3c/pop3c-storage.c +++ b/src/lib-storage/index/pop3c/pop3c-storage.c @@ -3,6 +3,7 @@ #include "lib.h" #include "ioloop.h" #include "str.h" +#include "settings-parser.h" #include "mail-copy.h" #include "mail-user.h" #include "mailbox-list-private.h" @@ -35,12 +36,13 @@ static struct mail_storage *pop3c_storage_alloc(void) static int pop3c_storage_create(struct mail_storage *_storage, - struct mail_namespace *ns, + struct mail_namespace *ns ATTR_UNUSED, const char **error_r) { struct pop3c_storage *storage = POP3C_STORAGE(_storage); - storage->set = mail_namespace_get_driver_settings(ns, _storage); + storage->set = settings_parser_get_root_set(_storage->user->set_parser, + pop3c_get_setting_parser_info()); if (storage->set->pop3c_host[0] == '\0') { *error_r = "missing pop3c_host"; return -1; diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index 6a4c9d1069..1ee4460db9 100644 --- a/src/lib-storage/mail-storage-settings.c +++ b/src/lib-storage/mail-storage-settings.c @@ -365,14 +365,6 @@ mail_user_set_get_storage_set(struct mail_user *user) &mail_storage_setting_parser_info); } -const void *mail_namespace_get_driver_settings(struct mail_namespace *ns, - struct mail_storage *storage) -{ - return mail_user_set_get_driver_settings(storage->user->set_parser, - storage->user->set_info, - ns->user_set, storage->v.get_setting_parser_info()); -} - const struct dynamic_settings_parser * mail_storage_get_dynamic_parsers(pool_t pool) { diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h index cd0f7ccd46..29097cda1a 100644 --- a/src/lib-storage/mail-storage-settings.h +++ b/src/lib-storage/mail-storage-settings.h @@ -162,9 +162,6 @@ mail_user_set_get_driver_settings(const struct setting_parser_context *set_parse const struct mail_storage_settings * mail_user_set_get_storage_set(struct mail_user *user); -/* Get storage-specific settings, which may be namespace-specific. */ -const void *mail_namespace_get_driver_settings(struct mail_namespace *ns, - struct mail_storage *storage); const struct dynamic_settings_parser * mail_storage_get_dynamic_parsers(pool_t pool);