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.

diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c
index 226c053848a4819944bd669d282bd9a1a6fad897..41c7ad53d953847247fb2e92f07f30e9f97bf364 100644 (file)
--- a/src/lib-storage/index/index-mailbox-size.c
+++ b/src/lib-storage/index/index-mailbox-size.c
@@ -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 @@ int index_mailbox_get_virtual_size(struct mailbox *box,
                                   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 --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 3ffa81f752f67f487b3bf39b2b24adcb91672a39..b3d5d14c2072b43069a8f10500975fa4b8103138 100644 (file)
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -291,7 +291,7 @@ int index_storage_mailbox_open(struct mailbox *box, bool move_to_memory)
        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 --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index f0501847afc1d4414f3d4a533ecd99f0b0e27ba7..3b23f81bf237a3d39e2a4a009c6057fd4107a2c8 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -16,12 +16,6 @@ enum mailbox_lock_notify_type {
        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 --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 3d96a09071d14eb114bbf8378fe6d171749a4ac8..e1e8d1e44c14f725d342305a9c8ae4fd2c8a3d05 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -265,6 +265,12 @@ struct mail_msgpart_partial_cache {
        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()) */