lib-storage: Use a default non-NULL mailbox.free() so plugins don't have to check...

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/cydir/cydir-storage.c b/src/lib-storage/index/cydir/cydir-storage.c
index 6912de72840f48a9a50e4cd83fcf8d8a1d5e8d31..e2a94c5af1bca2b24d59860480ba7904e27d7e28 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-storage.c
+++ b/src/lib-storage/index/cydir/cydir-storage.c
@@ -140,7 +140,7 @@ struct mailbox cydir_mailbox = {
                index_storage_mailbox_enable,
                cydir_mailbox_open,
                index_storage_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                cydir_mailbox_create,
                index_storage_mailbox_update,
                index_storage_mailbox_delete,

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index ed6692106bf1ed62b0d25f189babc00cbf49f856..0b4606a1a831428d4b5d1e8c5c6f2dc61ea550d6 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -327,7 +327,7 @@ struct mailbox mdbox_mailbox = {
                index_storage_mailbox_enable,
                dbox_mailbox_open,
                index_storage_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                dbox_mailbox_create,
                mdbox_mailbox_update,
                mdbox_mailbox_delete,

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 217f22cde8593b2303f1c7333091ce6c520bbeee..1936b8834ee29070f62259a247849e05926bbd3f 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -217,7 +217,7 @@ struct mailbox sdbox_mailbox = {
                index_storage_mailbox_enable,
                dbox_mailbox_open,
                index_storage_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                dbox_mailbox_create,
                dbox_mailbox_update,
                index_storage_mailbox_delete,

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index a83da96540ba2fa72e5675848739a6716a45ef13..016465f669faedc4731ebd4fc99daad42cd4e1f5 100644 (file)
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -331,6 +331,11 @@ void index_storage_mailbox_close(struct mailbox *box)
        ibox->sync_last_check = 0;
 }
 
+void index_storage_mailbox_free(struct mailbox *box)
+{
+       mail_index_alloc_cache_unref(&box->index);
+}
+
 static void
 index_storage_mailbox_update_cache_fields(struct mailbox *box,
                                          const struct mailbox_update *update)

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index 2b96dbb63cc3ae12f94ac1ea4ee85fc4b5b66f97..ff853947bfa337a73833b09340753f4cc4fc38eb 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -73,6 +73,7 @@ int index_storage_mailbox_open(struct mailbox *box, bool move_to_memory);
 int index_storage_mailbox_enable(struct mailbox *box,
                                 enum mailbox_feature feature);
 void index_storage_mailbox_close(struct mailbox *box);
+void index_storage_mailbox_free(struct mailbox *box);
 int index_storage_mailbox_update(struct mailbox *box,
                                 const struct mailbox_update *update);
 int index_storage_mailbox_delete(struct mailbox *box);

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index a093fd5792350bd643e236f9223f590441f839fe..d3692a45df90e37932ddb7732a625eb8647ab694 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -579,7 +579,7 @@ struct mailbox maildir_mailbox = {
                index_storage_mailbox_enable,
                maildir_mailbox_open,
                maildir_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                maildir_mailbox_create,
                maildir_mailbox_update,
                index_storage_mailbox_delete,

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 37e43fee2ce572abe64c9f3eb6b64ccd691eb12e..3bd6e5da28e40119f6f2290aab6874e13290d985 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -693,7 +693,7 @@ struct mailbox mbox_mailbox = {
                index_storage_mailbox_enable,
                mbox_mailbox_open,
                mbox_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                mbox_mailbox_create,
                mbox_mailbox_update,
                index_storage_mailbox_delete,

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 28f842e38ae83b963bc66e904b757246ab5f4c11..e996cb956b74e7ff6f8328c5ded3fa9b9bd37ef0 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -134,7 +134,7 @@ struct mailbox raw_mailbox = {
                index_storage_mailbox_enable,
                raw_mailbox_open,
                index_storage_mailbox_close,
-               NULL,
+               index_storage_mailbox_free,
                raw_mailbox_create,
                raw_mailbox_update,
                index_storage_mailbox_delete,

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 72be02ccea905212cdf6032e936228e17c04761e..c6618b2f9867ef7d2fc4ac199d6243f27fbca61f 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -580,10 +580,7 @@ void mailbox_free(struct mailbox **_box)
        *_box = NULL;
 
        mailbox_close(box);
-
-       if (box->v.free != NULL)
-               box->v.free(box);
-       mail_index_alloc_cache_unref(&box->index);
+       box->v.free(box);
        pool_unref(&box->pool);
 }