From 2c70086138fe7ac9abf52cd4223c224fe0bbb488 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 11 Jul 2015 12:03:56 +0300 Subject: [PATCH] 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. --- 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(-) diff --git a/src/lib-storage/index/index-mailbox-size.c b/src/lib-storage/index/index-mailbox-size.c index 226c053848..41c7ad53d9 100644 --- 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 3ffa81f752..b3d5d14c20 100644 --- 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 f0501847af..3b23f81bf2 100644 --- 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 3d96a09071..e1e8d1e44c 100644 --- 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()) */ -- 2.47.3