lib-storage: Remove mail_storage_vfuncs.get_setting_parser_info()

This is no longer necessary.

diff --git a/src/lib-storage/fail-mail-storage.c b/src/lib-storage/fail-mail-storage.c
index f89d6f6ab8b013e6a8aaa4619c9c5250b8d37237..82468bad7223ad583b59acc059eb7f9b08c85ee3 100644 (file)
--- a/src/lib-storage/fail-mail-storage.c
+++ b/src/lib-storage/fail-mail-storage.c
@@ -36,7 +36,6 @@ struct mail_storage fail_storage = {
        .class_flags = MAIL_STORAGE_CLASS_FLAG_NO_ROOT,
 
        .v = {
-               NULL,
                fail_storage_alloc,
                NULL,
                fail_storage_destroy,

diff --git a/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c b/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
index 193dca61b32a62c0a3304c3860273170ed316a19..38eea26cade74ecea6f9a59dd0c2480d4e9d349b 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
@@ -245,7 +245,6 @@ struct mail_storage mdbox_deleted_storage = {
                MAIL_STORAGE_CLASS_FLAG_BINARY_DATA,
 
        .v = {
-                mdbox_get_setting_parser_info,
                mdbox_deleted_storage_alloc,
                mdbox_storage_create,
                mdbox_storage_destroy,

diff --git a/src/lib-storage/index/dbox-multi/mdbox-settings.c b/src/lib-storage/index/dbox-multi/mdbox-settings.c
index 094b163a9d220e3cc6e60a0f1aab961ceb712840..cf300709fc0706084d02637385bb53d2ff597051 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-settings.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-settings.c
@@ -25,7 +25,7 @@ static const struct mdbox_settings mdbox_default_settings = {
        .mdbox_rotate_interval = 0
 };
 
-static const struct setting_parser_info mdbox_setting_parser_info = {
+const struct setting_parser_info mdbox_setting_parser_info = {
        .module_name = "mdbox",
        .defines = mdbox_setting_defines,
        .defaults = &mdbox_default_settings,
@@ -34,8 +34,3 @@ static const struct setting_parser_info mdbox_setting_parser_info = {
        .pool_offset1 = 1 + offsetof(struct mdbox_settings, pool),
        .parent = &mail_user_setting_parser_info
 };
-
-const struct setting_parser_info *mdbox_get_setting_parser_info(void)
-{
-       return &mdbox_setting_parser_info;
-}

diff --git a/src/lib-storage/index/dbox-multi/mdbox-settings.h b/src/lib-storage/index/dbox-multi/mdbox-settings.h
index ab3e67265c6383d754d8058a6a3fc8654b86f54e..1c2aeffc2358c3889fdb8ed3924600b404407cb8 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-settings.h
+++ b/src/lib-storage/index/dbox-multi/mdbox-settings.h
@@ -8,6 +8,6 @@ struct mdbox_settings {
        unsigned int mdbox_rotate_interval;
 };
 
-const struct setting_parser_info *mdbox_get_setting_parser_info(void);
+extern const struct setting_parser_info mdbox_setting_parser_info;
 
 #endif

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index a5fad241d4d1105d9a1e27d8d12abe77cfe986de..76cf449bc24b83634f797386fff9af2aa4df7f69 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -49,7 +49,7 @@ int mdbox_storage_create(struct mail_storage *_storage,
 
        if (master_service_settings_instance_get(_storage->event,
                        _storage->user->set_instance,
-                       mdbox_get_setting_parser_info(), 0,
+                       &mdbox_setting_parser_info, 0,
                        &storage->set, error_r) < 0)
                return -1;
 
@@ -477,7 +477,6 @@ struct mail_storage mdbox_storage = {
        .event_category = &event_category_mdbox,
 
        .v = {
-                mdbox_get_setting_parser_info,
                mdbox_storage_alloc,
                mdbox_storage_create,
                mdbox_storage_destroy,

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 9d70aa713d344e74f5bb64f3303c3e7cc1f0b341..c5139298c9eb26f25aca0ac31e97cd78f2130bf2 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -450,7 +450,6 @@ struct mail_storage sdbox_storage = {
        .event_category = &event_category_sdbox,
 
        .v = {
-                NULL,
                sdbox_storage_alloc,
                sdbox_storage_create,
                dbox_storage_destroy,
@@ -469,7 +468,6 @@ struct mail_storage dbox_storage = {
        .event_category = &event_category_sdbox,
 
        .v = {
-               NULL,
                sdbox_storage_alloc,
                sdbox_storage_create,
                dbox_storage_destroy,

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 9a99020ae96917be0bf0138932ec805efa8aa549..453363b52585dd92ecceb09baf198aaa828bff28 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -63,7 +63,7 @@ static const struct imapc_settings imapc_default_settings = {
        .pop3_deleted_flag = ""
 };
 
-static const struct setting_parser_info imapc_setting_parser_info = {
+const struct setting_parser_info imapc_setting_parser_info = {
        .module_name = "imapc",
        .defines = imapc_setting_defines,
        .defaults = &imapc_default_settings,
@@ -75,11 +75,6 @@ static const struct setting_parser_info imapc_setting_parser_info = {
        .check_func = imapc_settings_check
 };
 
-const struct setting_parser_info *imapc_get_setting_parser_info(void)
-{
-       return &imapc_setting_parser_info;
-}
-
 /* <settings checks> */
 struct imapc_feature_list {
        const char *name;

diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h
index 504c6205ca4e69a46017c6b9c172cc4c3ab7c8ff..bddded39223a6469a438319233be0f248ac11113 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.h
+++ b/src/lib-storage/index/imapc/imapc-settings.h
@@ -59,6 +59,6 @@ struct imapc_settings {
        unsigned int throttle_shrink_min_msecs;
 };
 
-const struct setting_parser_info *imapc_get_setting_parser_info(void);
+extern const struct setting_parser_info imapc_setting_parser_info;
 
 #endif

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 576c1aa113458630b8ffcd4814929961f78f30f5..f6c37cf252f1178c767776dac6553b660f433f54 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -317,8 +317,8 @@ int imapc_storage_client_create(struct mail_namespace *ns,
        string_t *str;
 
        if (master_service_settings_instance_get(ns->user->event,
-                       ns->user->set_instance, imapc_get_setting_parser_info(),
-                       0, &imapc_set, error_r) < 0)
+                       ns->user->set_instance, &imapc_setting_parser_info, 0,
+                       &imapc_set, error_r) < 0)
                return -1;
 
        i_zero(&set);
@@ -1354,7 +1354,6 @@ struct mail_storage imapc_storage = {
        .event_category = &event_category_imapc,
 
        .v = {
-               imapc_get_setting_parser_info,
                imapc_storage_alloc,
                imapc_storage_create,
                imapc_storage_destroy,

diff --git a/src/lib-storage/index/maildir/maildir-settings.c b/src/lib-storage/index/maildir/maildir-settings.c
index e203cd0e966ea9aa8ae1fb28e27f06ce80d107e4..f923aa5b54617e5cde573f42a04833883a490fe2 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-settings.c
+++ b/src/lib-storage/index/maildir/maildir-settings.c
@@ -27,7 +27,7 @@ static const struct maildir_settings maildir_default_settings = {
        .maildir_empty_new = FALSE
 };
 
-static const struct setting_parser_info maildir_setting_parser_info = {
+const struct setting_parser_info maildir_setting_parser_info = {
        .module_name = "maildir",
        .defines = maildir_setting_defines,
        .defaults = &maildir_default_settings,
@@ -36,9 +36,3 @@ static const struct setting_parser_info maildir_setting_parser_info = {
        .pool_offset1 = 1 + offsetof(struct maildir_settings, pool),
        .parent = &mail_user_setting_parser_info
 };
-
-const struct setting_parser_info *maildir_get_setting_parser_info(void)
-{
-       return &maildir_setting_parser_info;
-}
-

diff --git a/src/lib-storage/index/maildir/maildir-settings.h b/src/lib-storage/index/maildir/maildir-settings.h
index 055bcac6ef976a04fd18cc046bd7284703ce342d..616bd6b60a7b02f93ef378d2aeafeccfb31c9c6a 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-settings.h
+++ b/src/lib-storage/index/maildir/maildir-settings.h
@@ -9,6 +9,6 @@ struct maildir_settings {
        bool maildir_empty_new;
 };
 
-const struct setting_parser_info *maildir_get_setting_parser_info(void);
+extern const struct setting_parser_info maildir_setting_parser_info;
 
 #endif

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 635e94ecb3f4ac3c4c009632fec4a5f115da1b9e..b6425f051904a9c389d7431c378bc8368ca960e7 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -59,7 +59,7 @@ maildir_storage_create(struct mail_storage *_storage, struct mail_namespace *ns,
 
        if (master_service_settings_instance_get(_storage->event,
                        _storage->user->set_instance,
-                       maildir_get_setting_parser_info(), 0,
+                       &maildir_setting_parser_info, 0,
                        &storage->set, error_r) < 0)
                return -1;
 
@@ -737,7 +737,6 @@ struct mail_storage maildir_storage = {
        .event_category = &event_category_maildir,
 
        .v = {
-                maildir_get_setting_parser_info,
                maildir_storage_alloc,
                maildir_storage_create,
                maildir_storage_destroy,

diff --git a/src/lib-storage/index/mbox/mbox-settings.c b/src/lib-storage/index/mbox/mbox-settings.c
index df327686074f21e975f5cb36f8876f1fb0de95e5..1e531c6b13e60feb2f96bf85662d54a23dd0496e 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-settings.c
+++ b/src/lib-storage/index/mbox/mbox-settings.c
@@ -37,7 +37,7 @@ static const struct mbox_settings mbox_default_settings = {
        .mbox_md5 = "apop3d:all"
 };
 
-static const struct setting_parser_info mbox_setting_parser_info = {
+const struct setting_parser_info mbox_setting_parser_info = {
        .module_name = "mbox",
        .defines = mbox_setting_defines,
        .defaults = &mbox_default_settings,
@@ -46,8 +46,3 @@ static const struct setting_parser_info mbox_setting_parser_info = {
        .pool_offset1 = 1 + offsetof(struct mbox_settings, pool),
        .parent = &mail_user_setting_parser_info
 };
-
-const struct setting_parser_info *mbox_get_setting_parser_info(void)
-{
-       return &mbox_setting_parser_info;
-}

diff --git a/src/lib-storage/index/mbox/mbox-settings.h b/src/lib-storage/index/mbox/mbox-settings.h
index 1d48091ce74b68c938c0d1c589d70be1db32bfbe..bb1d449a94e25dfe93010aabbdf7e59abd42d317 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-settings.h
+++ b/src/lib-storage/index/mbox/mbox-settings.h
@@ -14,6 +14,6 @@ struct mbox_settings {
        const char *mbox_md5;
 };
 
-const struct setting_parser_info *mbox_get_setting_parser_info(void);
+extern const struct setting_parser_info mbox_setting_parser_info;
 
 #endif

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index b7ead523cd3b26fa924a0d4fb90bf16aed34da7d..fb7d92b790f413c9bfccbf7d5bff744485de24dd 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -187,7 +187,7 @@ mbox_storage_create(struct mail_storage *_storage, struct mail_namespace *ns,
 
        if (master_service_settings_instance_get(_storage->event,
                        _storage->user->set_instance,
-                       mbox_get_setting_parser_info(), 0,
+                       &mbox_setting_parser_info, 0,
                        &storage->set, error_r) < 0)
                return -1;
 
@@ -835,7 +835,6 @@ struct mail_storage mbox_storage = {
        .event_category = &event_category_mbox,
 
        .v = {
-                mbox_get_setting_parser_info,
                mbox_storage_alloc,
                mbox_storage_create,
                mbox_storage_destroy,

diff --git a/src/lib-storage/index/pop3c/pop3c-settings.c b/src/lib-storage/index/pop3c/pop3c-settings.c
index 4e1bd27f4160a3539705d536d6afe3f454e0e783..ea078e8982e314ddf2648a2e2570badc12003d2a 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-settings.c
+++ b/src/lib-storage/index/pop3c/pop3c-settings.c
@@ -96,7 +96,7 @@ static bool pop3c_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 }
 /* </settings checks> */
 
-static const struct setting_parser_info pop3c_setting_parser_info = {
+const struct setting_parser_info pop3c_setting_parser_info = {
        .module_name = "pop3c",
        .defines = pop3c_setting_defines,
        .defaults = &pop3c_default_settings,
@@ -107,8 +107,3 @@ static const struct setting_parser_info pop3c_setting_parser_info = {
 
         .check_func = pop3c_settings_check
 };
-
-const struct setting_parser_info *pop3c_get_setting_parser_info(void)
-{
-       return &pop3c_setting_parser_info;
-}

diff --git a/src/lib-storage/index/pop3c/pop3c-settings.h b/src/lib-storage/index/pop3c/pop3c-settings.h
index fb635ba04d15d5f85c3f6794518318f78273d343..13d597b8a1c718f5a23cf28ccaf1cef9ba828237 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-settings.h
+++ b/src/lib-storage/index/pop3c/pop3c-settings.h
@@ -29,6 +29,6 @@ struct pop3c_settings {
        enum pop3c_features parsed_features;
 };
 
-const struct setting_parser_info *pop3c_get_setting_parser_info(void);
+extern const struct setting_parser_info pop3c_setting_parser_info;
 
 #endif

diff --git a/src/lib-storage/index/pop3c/pop3c-storage.c b/src/lib-storage/index/pop3c/pop3c-storage.c
index be930a02316ce9393fce5c9f08a0784e6a42e284..d58803e703c85483bf361522fd4e847e8650eb9d 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-storage.c
+++ b/src/lib-storage/index/pop3c/pop3c-storage.c
@@ -44,7 +44,7 @@ pop3c_storage_create(struct mail_storage *_storage,
 
        if (master_service_settings_instance_get(_storage->event,
                        _storage->user->set_instance,
-                       pop3c_get_setting_parser_info(), 0,
+                       &pop3c_setting_parser_info, 0,
                        &storage->set, error_r) < 0)
                return -1;
 
@@ -323,7 +323,6 @@ struct mail_storage pop3c_storage = {
        .event_category = &event_category_pop3c,
 
        .v = {
-               pop3c_get_setting_parser_info,
                pop3c_storage_alloc,
                pop3c_storage_create,
                pop3c_storage_destroy,

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 9bc835e57ebfe81e08719287855bb592c7e7910b..83f379cf9d7f6683997b20dacd4c4dc844a99ea1 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -238,7 +238,6 @@ struct mail_storage raw_storage = {
                MAIL_STORAGE_CLASS_FLAG_BINARY_DATA,
 
        .v = {
-               NULL,
                raw_storage_alloc,
                NULL,
                index_storage_destroy,

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 348bacbf9a474e2c26dafc8c4944f315abc20346..1efb4672dbcb43af0714476c08992f947bfa71f0 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -411,7 +411,6 @@ struct mail_storage shared_storage = {
        .class_flags = 0, /* unknown at this point */
 
        .v = {
-               NULL,
                shared_storage_alloc,
                shared_storage_create,
                index_storage_destroy,

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 3f5aa1449c94b8ca62b2ad4cf14e314a562a7bcf..96d73e54877c2e0fef8690dd720b5814251baa68 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -51,8 +51,6 @@ struct mail_module_register {
 };
 
 struct mail_storage_vfuncs {
-       const struct setting_parser_info *(*get_setting_parser_info)(void);
-
        struct mail_storage *(*alloc)(void);
        int (*create)(struct mail_storage *storage, struct mail_namespace *ns,
                      const char **error_r);

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index 90b59900a9667d37ab0e46f26ceb0e2f5af53ab2..a96b15aaa861ef1d22095fbef341fc7af042e816 100644 (file)
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -928,7 +928,6 @@ struct mail_storage virtual_storage = {
                       MAIL_STORAGE_CLASS_FLAG_SECONDARY_INDEX,
 
        .v = {
-               NULL,
                virtual_storage_alloc,
                virtual_storage_create,
                index_storage_destroy,