lib-storage: Removed struct mail.get_index_mail(). get_real_mail() is basically the...

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/cydir/cydir-mail.c b/src/lib-storage/index/cydir/cydir-mail.c
index 7aac08115f924dcac33924d5a33fb9b1a61860f8..318e166bf0b4c45b65af4c4f2c899b214063af8b 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-mail.c
+++ b/src/lib-storage/index/cydir/cydir-mail.c
@@ -149,6 +149,5 @@ struct mail_vfuncs cydir_mail_vfuncs = {
        index_mail_update_uid,
        NULL,
        index_mail_expunge,
-       index_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       index_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/index/dbox-multi/mdbox-mail.c b/src/lib-storage/index/dbox-multi/mdbox-mail.c
index c1e85e2592c3317fcfa223ddf039cc196d1239ee..4899803438e4065de8143f8ee21edf753d8af910 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-mail.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-mail.c
@@ -215,6 +215,5 @@ struct mail_vfuncs mdbox_mail_vfuncs = {
        index_mail_update_uid,
        NULL,
        index_mail_expunge,
-       index_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       index_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/index/dbox-single/sdbox-mail.c b/src/lib-storage/index/dbox-single/sdbox-mail.c
index bb2718c87f76d11156c4bad6916aaf4993155268..4212483ffafb82f18d1825fab9fed84078fb2e19 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-mail.c
+++ b/src/lib-storage/index/dbox-single/sdbox-mail.c
@@ -105,6 +105,5 @@ struct mail_vfuncs sdbox_mail_vfuncs = {
        index_mail_update_uid,
        NULL,
        index_mail_expunge,
-       index_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       index_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 9d5656082c82b58024f5462a6e18f9a0d1842cb6..6b8ec8cd31232e38aad17d2e17144f6f309251e8 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1533,8 +1533,3 @@ void index_mail_set_cache_corrupted(struct mail *mail,
                                 "Broken %s for mail UID %u",
                                 field_name, mail->uid);
 }
-
-struct index_mail *index_mail_get_index_mail(struct mail *mail)
-{
-       return (struct index_mail *)mail;
-}

diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index 738e106eef3d751c01fdc39b03f7dc9f5a0f5c45..01e316334c7d1edf00d2a5e1d11896009a92e5a9 100644 (file)
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -1356,7 +1356,7 @@ bool index_storage_search_next_nonblock(struct mail_search_context *_ctx,
        cost1 = search_mail_get_cost(mail_private);
        while (box->v.search_next_update_seq(_ctx)) {
                mail_set_seq(mail, _ctx->seq);
-               ctx->imail = mail_private->v.get_index_mail(mail);
+               ctx->imail = (struct index_mail *)mail_get_real_mail(mail);
 
                T_BEGIN {
                        match = search_match_next(ctx);

diff --git a/src/lib-storage/index/maildir/maildir-mail.c b/src/lib-storage/index/maildir/maildir-mail.c
index 5aab1d767b380b06d59700430fbfe94b83e2b5aa..5f780c171c160bb8891f23dfd22e9e54f1b60735 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-mail.c
+++ b/src/lib-storage/index/maildir/maildir-mail.c
@@ -592,6 +592,5 @@ struct mail_vfuncs maildir_mail_vfuncs = {
        maildir_mail_update_uid,
        maildir_update_pop3_uidl,
        index_mail_expunge,
-       maildir_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       maildir_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/index/mbox/mbox-mail.c b/src/lib-storage/index/mbox/mbox-mail.c
index c1d2a61a730e779f5a95cf8ee4396f0e435795dc..9d0c9bcdb12b1abcbe80e6aee6438be46962075d 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-mail.c
+++ b/src/lib-storage/index/mbox/mbox-mail.c
@@ -410,6 +410,5 @@ struct mail_vfuncs mbox_mail_vfuncs = {
        index_mail_update_uid,
        NULL,
        index_mail_expunge,
-       index_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       index_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/index/raw/raw-mail.c b/src/lib-storage/index/raw/raw-mail.c
index 3d4346f96d629588afca237befd590248485794e..47807b7d968c1013f87b121ea68f6aef5ffc1a71 100644 (file)
--- a/src/lib-storage/index/raw/raw-mail.c
+++ b/src/lib-storage/index/raw/raw-mail.c
@@ -139,6 +139,5 @@ struct mail_vfuncs raw_mail_vfuncs = {
        index_mail_update_uid,
        NULL,
        index_mail_expunge,
-       index_mail_set_cache_corrupted,
-       index_mail_get_index_mail
+       index_mail_set_cache_corrupted
 };

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index be9f17f717f87488daa7e5e27cf3916c2d0a46d3..b80acb8eedce9dcecd325e18b0bc854997d30116 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -318,8 +318,6 @@ struct mail_vfuncs {
        void (*expunge)(struct mail *mail);
        void (*set_cache_corrupted)(struct mail *mail,
                                    enum mail_fetch_field field);
-
-       struct index_mail *(*get_index_mail)(struct mail *mail);
 };
 
 union mail_module_context {

diff --git a/src/lib-storage/test-mail.c b/src/lib-storage/test-mail.c
index c70b56e3d703ab68bc59a94d5b67d832ca6ab846..c2f69f2b17c843f9e6c147b5f71262c462bc0529 100644 (file)
--- a/src/lib-storage/test-mail.c
+++ b/src/lib-storage/test-mail.c
@@ -206,12 +206,6 @@ test_mail_set_cache_corrupted(struct mail *mail ATTR_UNUSED,
 {
 }
 
-static struct index_mail *
-test_mail_get_index_mail(struct mail *mail ATTR_UNUSED)
-{
-       return NULL;
-}
-
 struct mail_vfuncs test_mail_vfuncs = {
        NULL,
        test_mail_free,
@@ -241,6 +235,5 @@ struct mail_vfuncs test_mail_vfuncs = {
        test_mail_update_uid,
        NULL,
        test_mail_expunge,
-       test_mail_set_cache_corrupted,
-       test_mail_get_index_mail
+       test_mail_set_cache_corrupted
 };

diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c
index 163c53f3463b355b9dc669ddb5fcfeb0efd9b440..edb836fd041fb4241da955a3d58abfce0682b5ed 100644 (file)
--- a/src/plugins/virtual/virtual-mail.c
+++ b/src/plugins/virtual/virtual-mail.c
@@ -379,13 +379,6 @@ virtual_mail_set_cache_corrupted(struct mail *mail, enum mail_fetch_field field)
        mail_set_cache_corrupted(vmail->backend_mail, field);
 }
 
-static struct index_mail *virtual_mail_get_index_mail(struct mail *mail)
-{
-       struct virtual_mail *vmail = (struct virtual_mail *)mail;
-
-       return (struct index_mail *)vmail->backend_mail;
-}
-
 struct mail_vfuncs virtual_mail_vfuncs = {
        NULL,
        virtual_mail_free,
@@ -415,6 +408,5 @@ struct mail_vfuncs virtual_mail_vfuncs = {
        index_mail_update_uid,
        virtual_mail_update_pop3_uidl,
        virtual_mail_expunge,
-       virtual_mail_set_cache_corrupted,
-       virtual_mail_get_index_mail
+       virtual_mail_set_cache_corrupted
 };