dovecot-2.2: lib-storage: Moved vsize_hdr_ext_id to struct mailb...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/8e47bb182a42
changeset: 18904:8e47bb182a42
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Jul 11 12:06:44 2015 +0300
description:
lib-storage: Moved vsize_hdr_ext_id to struct mailbox for more global access.

diffstat:

 src/lib-storage/index/index-mailbox-size.c |  6 ++----
 src/lib-storage/index/index-storage.c      |  2 +-
 src/lib-storage/index/index-storage.h      |  1 -
 src/lib-storage/mail-storage-private.h     |  1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r 7cdef26d857d -r 8e47bb182a42 src/lib-storage/index/index-mailbox-size.c
--- a/src/lib-storage/index/index-mailbox-size.c	Sat Jul 11 12:03:56 2015 +0300
+++ b/src/lib-storage/index/index-mailbox-size.c	Sat Jul 11 12:06:44 2015 +0300
@@ -8,7 +8,6 @@
 virtual_size_add_new(struct mailbox *box,
 		     struct mailbox_index_vsize *vsize_hdr)
 {
-	struct index_mailbox_context *ibox = INDEX_STORAGE_CONTEXT(box);
 	const struct mail_index_header *hdr;
 	struct mailbox_transaction_context *trans;
 	struct mail_search_context *search_ctx;
@@ -66,7 +65,7 @@
 	} else {
 		/* search failed, cache only up to highest seen uid */
 	}
-	mail_index_update_header_ext(trans->itrans, ibox->vsize_hdr_ext_id,
+	mail_index_update_header_ext(trans->itrans, box->vsize_hdr_ext_id,
 				     0, vsize_hdr, sizeof(*vsize_hdr));
 	(void)mailbox_transaction_commit(&trans);
 	return ret;
@@ -75,7 +74,6 @@
 int index_mailbox_get_virtual_size(struct mailbox *box,
 				   struct mailbox_metadata *metadata_r)
 {
-	struct index_mailbox_context *ibox = INDEX_STORAGE_CONTEXT(box);
 	struct mailbox_index_vsize vsize_hdr;
 	struct mailbox_status status;
 	const void *data;
@@ -83,7 +81,7 @@
 	int ret;
 
 	mailbox_get_open_status(box, STATUS_MESSAGES | STATUS_UIDNEXT, &status);
-	mail_index_get_header_ext(box->view, ibox->vsize_hdr_ext_id,
+	mail_index_get_header_ext(box->view, box->vsize_hdr_ext_id,
 				  &data, &size);
 	if (size == sizeof(vsize_hdr))
 		memcpy(&vsize_hdr, data, sizeof(vsize_hdr));
diff -r 7cdef26d857d -r 8e47bb182a42 src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c	Sat Jul 11 12:03:56 2015 +0300
+++ b/src/lib-storage/index/index-storage.c	Sat Jul 11 12:06:44 2015 +0300
@@ -289,7 +289,7 @@
 	index_cache_register_defaults(box);
 	box->view = mail_index_view_open(box->index);
 	ibox->keyword_names = mail_index_get_keywords(box->index);
-	ibox->vsize_hdr_ext_id =
+	box->vsize_hdr_ext_id =
 		mail_index_ext_register(box->index, "hdr-vsize",
 					sizeof(struct mailbox_index_vsize), 0,
 					sizeof(uint64_t));
diff -r 7cdef26d857d -r 8e47bb182a42 src/lib-storage/index/index-storage.h
--- a/src/lib-storage/index/index-storage.h	Sat Jul 11 12:03:56 2015 +0300
+++ b/src/lib-storage/index/index-storage.h	Sat Jul 11 12:06:44 2015 +0300
@@ -33,7 +33,6 @@
 	ARRAY_TYPE(seq_range) recent_flags;
 	uint32_t recent_flags_prev_uid, recent_flags_last_check_nextuid;
 	uint32_t recent_flags_count;
-	uint32_t vsize_hdr_ext_id;
 
 	time_t sync_last_check;
 	uint32_t list_index_sync_ext_id;
diff -r 7cdef26d857d -r 8e47bb182a42 src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Sat Jul 11 12:03:56 2015 +0300
+++ b/src/lib-storage/mail-storage-private.h	Sat Jul 11 12:06:44 2015 +0300
@@ -317,6 +317,7 @@
 	unsigned int transaction_count;
 	enum mailbox_feature enabled_features;
 	struct mail_msgpart_partial_cache partial_cache;
+	uint32_t vsize_hdr_ext_id;
 
 	struct mail_index_view *tmp_sync_view;