lib-storage: Moved vsize_hdr_ext_id to struct mailbox 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 41c7ad53d953847247fb2e92f07f30e9f97bf364..baafb6c5a8ea8667926c4cac1603b59b0ff553c7 100644 (file)
--- a/src/lib-storage/index/index-mailbox-size.c
+++ b/src/lib-storage/index/index-mailbox-size.c
@@ -8,7 +8,6 @@ static int
 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 @@ virtual_size_add_new(struct mailbox *box,
        } 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 @@ virtual_size_add_new(struct mailbox *box,
 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 index_mailbox_get_virtual_size(struct mailbox *box,
        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 --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index b3d5d14c2072b43069a8f10500975fa4b8103138..d811a066756941078f51b268a56dd87d27500fca 100644 (file)
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -289,7 +289,7 @@ int index_storage_mailbox_open(struct mailbox *box, bool move_to_memory)
        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 --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index 3b23f81bf237a3d39e2a4a009c6057fd4107a2c8..d92bde370a8fdb45c7e2eb173b5022b6e2907f99 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -33,7 +33,6 @@ struct index_mailbox_context {
        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 --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index e1e8d1e44c14f725d342305a9c8ae4fd2c8a3d05..d9ae42991404ed45649e665171d306560e8376d9 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -317,6 +317,7 @@ struct mailbox {
        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;