Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7093:f0623745bd4c HEAD
libstorage.a shouldn't reference symbols in libstorage_index.a. Changed
index_storage_destroy_unrefed() call to be done by storage.destroy().
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 02 Jan 2008 01:59:32 +0200 |
parents | a31c0f6f4386 |
children | 145f721b6412 |
files | src/lib-storage/index/cydir/cydir-storage.c src/lib-storage/index/dbox/dbox-storage.c src/lib-storage/index/index-storage.c src/lib-storage/index/index-storage.h src/lib-storage/index/maildir/maildir-storage.c src/lib-storage/index/mbox/mbox-storage.c src/lib-storage/index/raw/raw-storage.c src/lib-storage/mail-storage.c |
diffstat | 8 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/cydir/cydir-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/cydir/cydir-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -399,7 +399,7 @@ cydir_class_deinit, cydir_alloc, cydir_create, - NULL, + index_storage_destroy, NULL, cydir_mailbox_open, cydir_mailbox_create
--- a/src/lib-storage/index/dbox/dbox-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/dbox/dbox-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -510,7 +510,7 @@ dbox_class_deinit, dbox_alloc, dbox_create, - NULL, + index_storage_destroy, NULL, dbox_mailbox_open, dbox_mailbox_create
--- a/src/lib-storage/index/index-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/index-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -235,6 +235,11 @@ destroy_unrefed(TRUE); } +void index_storage_destroy(struct mail_storage *storage ATTR_UNUSED) +{ + index_storage_destroy_unrefed(); +} + static void set_cache_decisions(const char *set, const char *fields, enum mail_cache_decision_type dec) {
--- a/src/lib-storage/index/index-storage.h Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/index-storage.h Wed Jan 02 01:59:32 2008 +0200 @@ -97,6 +97,7 @@ enum mailbox_open_flags flags, const char *prefix); void index_storage_unref(struct mail_index *index); void index_storage_destroy_unrefed(void); +void index_storage_destroy(struct mail_storage *storage ATTR_UNUSED); void index_storage_mailbox_init(struct index_mailbox *ibox, const char *name, enum mailbox_open_flags flags,
--- a/src/lib-storage/index/maildir/maildir-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/maildir/maildir-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -977,7 +977,7 @@ maildir_class_deinit, maildir_alloc, maildir_create, - NULL, + index_storage_destroy, maildir_autodetect, maildir_mailbox_open, maildir_mailbox_create
--- a/src/lib-storage/index/mbox/mbox-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/mbox/mbox-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -911,7 +911,7 @@ mbox_class_deinit, mbox_alloc, mbox_create, - NULL, + index_storage_destroy, mbox_autodetect, mbox_mailbox_open, mbox_mailbox_create
--- a/src/lib-storage/index/raw/raw-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/index/raw/raw-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -258,7 +258,7 @@ raw_class_deinit, raw_alloc, raw_create, - NULL, + index_storage_destroy, NULL, raw_mailbox_open, raw_mailbox_create
--- a/src/lib-storage/mail-storage.c Wed Jan 02 01:42:32 2008 +0200 +++ b/src/lib-storage/mail-storage.c Wed Jan 02 01:59:32 2008 +0200 @@ -9,7 +9,6 @@ #include "mail-storage-private.h" #include "mail-namespace.h" #include "mail-search.h" -#include "index/index-storage.h" #include <stdlib.h> #include <time.h> @@ -266,14 +265,10 @@ *_storage = NULL; - if (storage->v.destroy != NULL) - storage->v.destroy(storage); - + storage->v.destroy(storage); mailbox_list_deinit(storage->list); i_free(storage->error_string); pool_unref(&storage->pool); - - index_storage_destroy_unrefed(); } void mail_storage_clear_error(struct mail_storage *storage)