lib-index: Added mail_index_ext_resize_hdr()

diff --git a/src/lib-index/mail-index-transaction-update.c b/src/lib-index/mail-index-transaction-update.c
index aae27e2299f4c088a79789baa8cf23d3ef599e9f..fa88b85495b5a1c50b006b494b87874e77c4271f 100644 (file)
--- a/src/lib-index/mail-index-transaction-update.c
+++ b/src/lib-index/mail-index-transaction-update.c
@@ -717,7 +717,7 @@ void mail_index_ext_resize(struct mail_index_transaction *t, uint32_t ext_id,
                           uint16_t record_align)
 {
        struct mail_transaction_ext_intro intro;
-       uint32_t old_record_size, old_record_align;
+       uint32_t old_record_size, old_record_align, old_header_size;
 
        memset(&intro, 0, sizeof(intro));
 
@@ -730,17 +730,20 @@ void mail_index_ext_resize(struct mail_index_transaction *t, uint32_t ext_id,
                rext = array_idx(&t->view->index->extensions, ext_id);
                old_record_size = rext->record_size;
                old_record_align = rext->record_align;
+               old_header_size = rext->hdr_size;
        } else {
                const struct mail_index_ext *ext;
 
                ext = array_idx(&t->view->map->extensions, intro.ext_id);
                old_record_size = ext->record_size;
                old_record_align = ext->record_align;
+               old_header_size = ext->hdr_size;
        }
 
        /* allow only header size changes if extension records have already
           been changed in transaction */
        i_assert(!array_is_created(&t->ext_rec_updates) ||
+                record_size == (uint16_t)-1 ||
                 (old_record_size == record_size &&
                  old_record_align == record_align));
 
@@ -749,13 +752,26 @@ void mail_index_ext_resize(struct mail_index_transaction *t, uint32_t ext_id,
        if (!array_is_created(&t->ext_resizes))
                i_array_init(&t->ext_resizes, ext_id + 2);
 
-       intro.hdr_size = hdr_size;
-       intro.record_size = record_size;
-       intro.record_align = record_align;
+       intro.hdr_size = hdr_size != (uint32_t)-1 ? hdr_size : old_header_size;
+       if (record_size != (uint16_t)-1) {
+               i_assert(record_align != (uint16_t)-1);
+               intro.record_size = record_size;
+               intro.record_align = record_align;
+       } else {
+               i_assert(record_align == (uint16_t)-1);
+               intro.record_size = old_record_size;
+               intro.record_align = old_record_align;
+       }
        intro.name_size = 1;
        array_idx_set(&t->ext_resizes, ext_id, &intro);
 }
 
+void mail_index_ext_resize_hdr(struct mail_index_transaction *t,
+                              uint32_t ext_id, uint32_t hdr_size)
+{
+       mail_index_ext_resize(t, ext_id, hdr_size, (uint16_t)-1, (uint16_t)-1);
+}
+
 void mail_index_ext_reset(struct mail_index_transaction *t, uint32_t ext_id,
                          uint32_t reset_id, bool clear_data)
 {

diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index 1a108434d14793f780c3cf1f6a29c595b354e53f..e3a336277de25b164e9a6225dff06b5635bb9065 100644 (file)
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -555,6 +555,9 @@ bool mail_index_ext_lookup(struct mail_index *index, const char *name,
 void mail_index_ext_resize(struct mail_index_transaction *t, uint32_t ext_id,
                           uint32_t hdr_size, uint16_t record_size,
                           uint16_t record_align);
+/* Resize header, keeping the old record size. */
+void mail_index_ext_resize_hdr(struct mail_index_transaction *t,
+                              uint32_t ext_id, uint32_t hdr_size);
 
 /* Reset extension. Any updates for this extension which were issued before the
    writer had seen this reset are discarded. reset_id is used to figure this