dovecot-2.2: lib-storage: Renamed struct index_vsize_header to s...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/7cdef26d857d
changeset: 18903:7cdef26d857d
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Jul 11 12:03:56 2015 +0300
description:
lib-storage: Renamed struct index_vsize_header to struct mailbox_index_vsize
Also moved the struct to mail-storage-private.h for more global access.

diffstat:

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

diffs (65 lines):

diff -r 819649386f93 -r 7cdef26d857d src/lib-storage/index/index-mailbox-size.c
--- a/src/lib-storage/index/index-mailbox-size.c	Sat Jul 11 12:00:38 2015 +0300
+++ b/src/lib-storage/index/index-mailbox-size.c	Sat Jul 11 12:03:56 2015 +0300
@@ -6,7 +6,7 @@
 
 static int
 virtual_size_add_new(struct mailbox *box,
-		     struct index_vsize_header *vsize_hdr)
+		     struct mailbox_index_vsize *vsize_hdr)
 {
 	struct index_mailbox_context *ibox = INDEX_STORAGE_CONTEXT(box);
 	const struct mail_index_header *hdr;
@@ -76,7 +76,7 @@
 				   struct mailbox_metadata *metadata_r)
 {
 	struct index_mailbox_context *ibox = INDEX_STORAGE_CONTEXT(box);
-	struct index_vsize_header vsize_hdr;
+	struct mailbox_index_vsize vsize_hdr;
 	struct mailbox_status status;
 	const void *data;
 	size_t size;
diff -r 819649386f93 -r 7cdef26d857d src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c	Sat Jul 11 12:00:38 2015 +0300
+++ b/src/lib-storage/index/index-storage.c	Sat Jul 11 12:03:56 2015 +0300
@@ -291,7 +291,7 @@
 	ibox->keyword_names = mail_index_get_keywords(box->index);
 	ibox->vsize_hdr_ext_id =
 		mail_index_ext_register(box->index, "hdr-vsize",
-					sizeof(struct index_vsize_header), 0,
+					sizeof(struct mailbox_index_vsize), 0,
 					sizeof(uint64_t));
 
 	box->opened = TRUE;
diff -r 819649386f93 -r 7cdef26d857d src/lib-storage/index/index-storage.h
--- a/src/lib-storage/index/index-storage.h	Sat Jul 11 12:00:38 2015 +0300
+++ b/src/lib-storage/index/index-storage.h	Sat Jul 11 12:03:56 2015 +0300
@@ -16,12 +16,6 @@
 	MAILBOX_LOCK_NOTIFY_MAILBOX_OVERRIDE
 };
 
-struct index_vsize_header {
-	uint64_t vsize;
-	uint32_t highest_uid;
-	uint32_t message_count;
-};
-
 struct index_mailbox_context {
 	union mailbox_module_context module_ctx;
 	enum mail_index_open_flags index_flags;
diff -r 819649386f93 -r 7cdef26d857d src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Sat Jul 11 12:00:38 2015 +0300
+++ b/src/lib-storage/mail-storage-private.h	Sat Jul 11 12:03:56 2015 +0300
@@ -265,6 +265,12 @@
 	uoff_t physical_pos, virtual_pos;
 };
 
+struct mailbox_index_vsize {
+	uint64_t vsize;
+	uint32_t highest_uid;
+	uint32_t message_count;
+};
+
 struct mailbox {
 	const char *name;
 	/* mailbox's virtual name (from mail_namespace_get_vname()) */