lib-storage: Remove empty struct mailbox_list_settings and related functions

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index faf69d4b01567e4dde44af0c8ad9c830729f2cfc..066b2caff268f20f3da13432b58e1447089ba164 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -117,7 +117,6 @@ mdbox_storage_find_root_dir(const struct mail_namespace *ns)
 
 static bool
 mdbox_storage_autodetect(const struct mail_namespace *ns,
-                        struct mailbox_list_settings *set ATTR_UNUSED,
                         const struct mail_storage_settings *mail_set,
                         const char **root_path_r,
                         const char **inbox_path_r ATTR_UNUSED)

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 86a7e76c90f2210007fa0dedc5bf09760266040b..42de9a048fdf9372d9e94022fc92a662900bec5f 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -79,7 +79,6 @@ sdbox_storage_find_root_dir(const struct mail_namespace *ns)
 
 static bool
 sdbox_storage_autodetect(const struct mail_namespace *ns,
-                        struct mailbox_list_settings *set ATTR_UNUSED,
                         const struct mail_storage_settings *mail_set,
                         const char **root_path_r,
                         const char **inbox_path_r ATTR_UNUSED)

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 4181122981035d85187048eade893d94ce1f29c5..3a863092247b9138e87ebd6edd2641540b92a3fe 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -417,7 +417,6 @@ imapc_list_get_vname(struct mailbox_list *_list, const char *storage_name)
 
 static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
 {
-       struct mailbox_list_settings list_set;
        const char *error, *dir;
 
        if (list->list.mail_set->mail_index_path[0] == '\0')
@@ -431,7 +430,6 @@ static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
        if (dir[0] == '\0') {
                /* indexes disabled */
        } else if (list->index_list == NULL && !list->index_list_failed) {
-               mailbox_list_settings_init_defaults(&list_set);
                struct settings_instance *set_instance =
                        mail_storage_service_user_get_settings_instance(
                                list->list.ns->user->service_user);
@@ -467,8 +465,7 @@ static struct mailbox_list *imapc_list_get_fs(struct imapc_mailbox_list *list)
                                 &mail_set, &error) < 0) {
                        e_error(list->list.event, "%s", error);
                        list->index_list_failed = TRUE;
-               } else if (mailbox_list_create(event, list->list.ns,
-                                              &list_set, mail_set,
+               } else if (mailbox_list_create(event, list->list.ns, mail_set,
                                               MAILBOX_LIST_FLAG_SECONDARY,
                                               &list->index_list, &error) < 0) {
                        e_error(list->list.event,

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index c45436ef7a37ca9ab4ca8bfe178aa1b8e770f1c4..f81a4546ac949f8deb606b328e7bcef7e1dcad6e 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -118,7 +118,6 @@ maildir_storage_find_root_dir(const struct mail_namespace *ns)
 
 static bool
 maildir_storage_autodetect(const struct mail_namespace *ns,
-                          struct mailbox_list_settings *set ATTR_UNUSED,
                           const struct mail_storage_settings *mail_set,
                           const char **root_path_r,
                           const char **inbox_path_r ATTR_UNUSED)

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 0893b61945e1cf419552cb89196abf882b11ed2c..e86c4f07dfbb233467292f4190b2707bf9c6bd78 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -315,7 +315,6 @@ mbox_storage_find_inbox_file(struct mail_user *user, struct event *event)
 
 static bool
 mbox_storage_autodetect(const struct mail_namespace *ns,
-                       struct mailbox_list_settings *set ATTR_UNUSED,
                        const struct mail_storage_settings *mail_set,
                        const char **root_path_r, const char **inbox_path_r)
 {

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index c52debffa9639fe413f1ad12de78c2d63642b9c1..592d3cfdd10d63142aa1b0dc76d116d067b2d614 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -62,7 +62,6 @@ struct mail_storage_vfuncs {
           must be returned in that case. inbox_path_r is NULL already when
           calling, and means the default INBOX path is used. */
        bool (*autodetect)(const struct mail_namespace *ns,
-                          struct mailbox_list_settings *set,
                           const struct mail_storage_settings *mail_set,
                           const char **root_path_r, const char **inbox_path_r);
 

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 5569ee96208c7b56d4c8257c6fe003dee3e2862c..c33448b6f8dc5cf6eb795ce2b28a10cb906f6c80 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -140,7 +140,6 @@ struct mail_storage *mail_storage_find_class(const char *name)
 
 static struct mail_storage *
 mail_storage_autodetect(const struct mail_namespace *ns,
-                       struct mailbox_list_settings *set,
                        const struct mail_storage_settings *mail_set,
                        const char **root_path_override,
                        const char **inbox_path_override)
@@ -152,7 +151,7 @@ mail_storage_autodetect(const struct mail_namespace *ns,
        classes = array_get(&mail_storage_classes, &count);
        for (i = 0; i < count; i++) {
                if (classes[i]->v.autodetect != NULL) {
-                       if (classes[i]->v.autodetect(ns, set, mail_set,
+                       if (classes[i]->v.autodetect(ns, mail_set,
                                                     &root_path, &inbox_path)) {
                                *root_path_override = root_path;
                                *inbox_path_override = inbox_path;
@@ -182,7 +181,6 @@ mail_storage_set_autodetection(const char **data, const char **driver)
 static struct mail_storage *
 mail_storage_get_class(struct mail_namespace *ns, const char *driver,
                       const struct mail_storage_settings *mail_set,
-                      struct mailbox_list_settings *list_set,
                       const char **root_path_override,
                       const char **inbox_path_override, const char **error_r)
 {
@@ -205,7 +203,7 @@ mail_storage_get_class(struct mail_namespace *ns, const char *driver,
        if (storage_class != NULL)
                return storage_class;
 
-       storage_class = mail_storage_autodetect(ns, list_set, mail_set,
+       storage_class = mail_storage_autodetect(ns, mail_set,
                                                root_path_override,
                                                inbox_path_override);
        if (storage_class != NULL)
@@ -350,7 +348,6 @@ mail_storage_create_list(struct mail_namespace *ns,
                         struct mail_storage *storage_class,
                         struct event *set_event,
                         enum mail_storage_flags flags,
-                        struct mailbox_list_settings *list_set,
                         const char *root_path_override,
                         const char *inbox_path_override,
                         const char **error_r)
@@ -439,8 +436,8 @@ mail_storage_create_list(struct mail_namespace *ns,
 
        struct event *event = event_create(ns->user->event);
        event_add_str(event, "namespace", ns->set->name);
-       int ret = mailbox_list_create(event, ns, list_set,
-                                     mail_set, list_flags, &list, error_r);
+       int ret = mailbox_list_create(event, ns, mail_set, list_flags,
+                                     &list, error_r);
        if (ret < 0) {
                *error_r = t_strdup_printf("mailbox_list_layout %s: %s",
                        mail_set->mailbox_list_layout, *error_r);
@@ -458,7 +455,6 @@ mail_storage_create_real(struct mail_namespace *ns, struct event *set_event,
 {
        struct mail_storage *storage_class, *storage = NULL;
        const struct mail_storage_settings *mail_set;
-       struct mailbox_list_settings list_set;
        const char *p, *data, *driver = NULL;
        const char *inbox_path_override = NULL;
        const char *root_path_override = NULL;
@@ -471,21 +467,15 @@ mail_storage_create_real(struct mail_namespace *ns, struct event *set_event,
                return -1;
        data = mail_set->mail_location;
 
-       mailbox_list_settings_init_defaults(&list_set);
        if ((flags & MAIL_STORAGE_FLAG_SHARED_DYNAMIC) != 0) {
                /* internal shared namespace */
                driver = MAIL_SHARED_STORAGE_NAME;
                root_path_override = ns->user->set->base_dir;
        } else {
                mail_storage_set_autodetection(&data, &driver);
-               if (mailbox_list_settings_parse(ns->user, data, &list_set,
-                                               error_r) < 0) {
-                       settings_free(mail_set);
-                       return -1;
-               }
        }
 
-       storage_class = mail_storage_get_class(ns, driver, mail_set, &list_set,
+       storage_class = mail_storage_get_class(ns, driver, mail_set,
                                               &root_path_override,
                                               &inbox_path_override, error_r);
        settings_free(mail_set);
@@ -495,8 +485,7 @@ mail_storage_create_real(struct mail_namespace *ns, struct event *set_event,
        if (ns->list == NULL) {
                /* first storage for namespace */
                if (mail_storage_create_list(ns, storage_class, set_event,
-                                            flags, &list_set,
-                                            root_path_override,
+                                            flags, root_path_override,
                                             inbox_path_override, error_r) < 0)
                        return -1;
                if ((storage_class->class_flags & MAIL_STORAGE_CLASS_FLAG_NO_ROOT) == 0) {

diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index ed4eca8e170aeb39e8d3c3e9ccd83b2d68ae0d5d..f39c9830cac3da97e8c3df79cf6d502142d3467b 100644 (file)
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -113,7 +113,6 @@ struct mailbox_list {
 /* private: */
        pool_t pool;
        struct mail_namespace *ns;
-       struct mailbox_list_settings set;
        const struct mail_storage_settings *mail_set;
        enum mailbox_list_flags flags;
 
@@ -189,10 +188,6 @@ extern struct mailbox_list_module_register mailbox_list_module_register;
 void mailbox_lists_init(void);
 void mailbox_lists_deinit(void);
 
-void mailbox_list_settings_init_defaults(struct mailbox_list_settings *set_r);
-int mailbox_list_settings_parse(struct mail_user *user, const char *data,
-                               struct mailbox_list_settings *set_r,
-                               const char **error_r);
 const char *
 mailbox_list_escape_name_params(const char *vname, const char *ns_prefix,
                                char ns_sep, char list_sep, char escape_char,

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 3dbb05e8b1ca2351f827ccbde59f70ac214522ce..0e09a23091a494116e367dc3370583869b161232 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -104,7 +104,6 @@ mailbox_list_find_class(const char *driver)
 }
 
 int mailbox_list_create(struct event *event, struct mail_namespace *ns,
-                       const struct mailbox_list_settings *set ATTR_UNUSED,
                        const struct mail_storage_settings *mail_set,
                        enum mailbox_list_flags flags,
                        struct mailbox_list **list_r, const char **error_r)
@@ -178,36 +177,6 @@ int mailbox_list_create(struct event *event, struct mail_namespace *ns,
        return 0;
 }
 
-void mailbox_list_settings_init_defaults(struct mailbox_list_settings *set_r)
-{
-       i_zero(set_r);
-}
-
-static int
-mailbox_list_settings_parse_full(struct mail_user *user ATTR_UNUSED,
-                                const char *data ATTR_UNUSED,
-                                bool expand_home ATTR_UNUSED,
-                                struct mailbox_list_settings *set_r,
-                                const char **error_r)
-{
-       *error_r = NULL;
-
-       mailbox_list_settings_init_defaults(set_r);
-       if (*data == '\0')
-               return 0;
-
-       *error_r = "Unknown settings";
-       return -1;
-}
-
-int mailbox_list_settings_parse(struct mail_user *user, const char *data,
-                               struct mailbox_list_settings *set_r,
-                               const char **error_r)
-{
-       return mailbox_list_settings_parse_full(user, data, TRUE,
-                                               set_r, error_r);
-}
-
 const char *mailbox_list_get_unexpanded_path(struct mailbox_list *list,
                                             enum mailbox_list_path_type type)
 {
@@ -595,12 +564,6 @@ const char *mailbox_list_get_driver_name(const struct mailbox_list *list)
        return list->name;
 }
 
-const struct mailbox_list_settings *
-mailbox_list_get_settings(const struct mailbox_list *list)
-{
-       return &list->set;
-}
-
 enum mailbox_list_flags mailbox_list_get_flags(const struct mailbox_list *list)
 {
        return list->flags;

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
index 5799e6fb0aea1513ef68462b30e7afc6adade65f..514c71e788f3c4bd99bc745eeadc53479101b526 100644 (file)
--- a/src/lib-storage/mailbox-list.h
+++ b/src/lib-storage/mailbox-list.h
@@ -113,9 +113,6 @@ enum mailbox_list_get_storage_flags {
        MAILBOX_LIST_GET_STORAGE_FLAG_SAVEONLY = BIT(0),
 };
 
-struct mailbox_list_settings {
-};
-
 struct mailbox_permissions {
        /* The actual uid/gid of the mailbox */
        uid_t file_uid;
@@ -142,7 +139,6 @@ const struct mailbox_list *
 mailbox_list_find_class(const char *driver);
 
 int mailbox_list_create(struct event *event, struct mail_namespace *ns,
-                       const struct mailbox_list_settings *set,
                        const struct mail_storage_settings *mail_set,
                        enum mailbox_list_flags flags,
                        struct mailbox_list **list_r, const char **error_r);
@@ -150,8 +146,6 @@ void mailbox_list_destroy(struct mailbox_list **list);
 
 const char *
 mailbox_list_get_driver_name(const struct mailbox_list *list) ATTR_PURE;
-const struct mailbox_list_settings *
-mailbox_list_get_settings(const struct mailbox_list *list) ATTR_PURE;
 enum mailbox_list_flags
 mailbox_list_get_flags(const struct mailbox_list *list) ATTR_PURE;
 struct mail_namespace *