Removed rarely used parameters from mail_index_transaction_commit().

mail_index_transaction_commit_get_pos() can be used where they're required.

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c
index 23a0a1c4bfa2905403ab65530fb4248d09db58bd..128120b8d9477dd87925324faf14a0fa7edc2a35 100644 (file)
--- a/src/lib-index/mail-cache-transaction.c
+++ b/src/lib-index/mail-cache-transaction.c
@@ -116,8 +116,6 @@ mail_cache_transaction_compress(struct mail_cache_transaction_ctx *ctx)
        struct mail_cache *cache = ctx->cache;
        struct mail_index_view *view;
        struct mail_index_transaction *trans;
-       uint32_t log_file_seq;
-       uoff_t log_file_offset;
        int ret;
 
        ctx->tried_compression = TRUE;
@@ -132,8 +130,7 @@ mail_cache_transaction_compress(struct mail_cache_transaction_ctx *ctx)
                mail_index_transaction_rollback(&trans);
                ret = -1;
        } else {
-               ret = mail_index_transaction_commit(&trans, &log_file_seq,
-                                                   &log_file_offset);
+               ret = mail_index_transaction_commit(&trans);
        }
        mail_index_view_close(&view);
        mail_cache_transaction_reset(ctx);

diff --git a/src/lib-index/mail-index-modseq.c b/src/lib-index/mail-index-modseq.c
index 841d379428f6a8ad98fda80e970154d113797d74..12112d484fa5b582a1d46e113efbcda11b66438e 100644 (file)
--- a/src/lib-index/mail-index-modseq.c
+++ b/src/lib-index/mail-index-modseq.c
@@ -57,8 +57,7 @@ void mail_index_modseq_enable(struct mail_index *index)
        struct mail_index_transaction *trans;
        struct mail_index_view *view;
        struct mail_index_modseq_header hdr;
-       uint32_t ext_map_idx, log_seq;
-       uoff_t log_offset;
+       uint32_t ext_map_idx;
 
        if (index->modseqs_enabled)
                return;
@@ -75,8 +74,7 @@ void mail_index_modseq_enable(struct mail_index *index)
                                             0, &hdr, sizeof(hdr));
 
                /* commit also refreshes the index, which syncs the modseqs */
-               (void)mail_index_transaction_commit(&trans,
-                                                   &log_seq, &log_offset);
+               (void)mail_index_transaction_commit(&trans);
                mail_index_view_close(&view);
 
                /* get the modseq extension to index map */

diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c
index ab0c40820dfa5d34c7e52f462bdcc7088ef4b9af..aeebe522f13974c21b112675d4290985557cc10e 100644 (file)
--- a/src/lib-index/mail-index-sync.c
+++ b/src/lib-index/mail-index-sync.c
@@ -723,8 +723,7 @@ int mail_index_sync_commit(struct mail_index_sync_ctx **_ctx)
 {
         struct mail_index_sync_ctx *ctx = *_ctx;
        struct mail_index *index = ctx->index;
-       uint32_t seq, next_uid;
-       uoff_t offset;
+       uint32_t next_uid;
        bool want_rotate;
        int ret = 0;
 
@@ -746,7 +745,7 @@ int mail_index_sync_commit(struct mail_index_sync_ctx **_ctx)
                }
        }
 
-       if (mail_index_transaction_commit(&ctx->ext_trans, &seq, &offset) < 0) {
+       if (mail_index_transaction_commit(&ctx->ext_trans) < 0) {
                mail_index_sync_end(&ctx);
                return -1;
        }

diff --git a/src/lib-index/mail-index-transaction.c b/src/lib-index/mail-index-transaction.c
index f23e70aaf157aa29ec5accabb2695006df1ab977..ec2517b74538b5ad877a346bd7f306fc0d4deede 100644 (file)
--- a/src/lib-index/mail-index-transaction.c
+++ b/src/lib-index/mail-index-transaction.c
@@ -622,9 +622,17 @@ static void mail_index_transaction_rollback_v(struct mail_index_transaction *t)
         mail_index_transaction_unref(&t);
 }
 
-int mail_index_transaction_commit(struct mail_index_transaction **_t,
-                                 uint32_t *log_file_seq_r,
-                                 uoff_t *log_file_offset_r)
+int mail_index_transaction_commit(struct mail_index_transaction **t)
+{
+       uint32_t log_seq;
+       uoff_t log_offset;
+
+       return mail_index_transaction_commit_get_pos(t, &log_seq, &log_offset);
+}
+
+int mail_index_transaction_commit_get_pos(struct mail_index_transaction **_t,
+                                         uint32_t *log_file_seq_r,
+                                         uoff_t *log_file_offset_r)
 {
        struct mail_index_transaction *t = *_t;
 

diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index 4112d1361270676a4d7737e84b56f391c9f8844a..7c0e19355aec7d8750c8e82ef770dd1130b04998 100644 (file)
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -229,9 +229,10 @@ bool mail_index_view_is_inconsistent(struct mail_index_view *view);
 struct mail_index_transaction *
 mail_index_transaction_begin(struct mail_index_view *view,
                             enum mail_index_transaction_flags flags);
-int mail_index_transaction_commit(struct mail_index_transaction **t,
-                                 uint32_t *log_file_seq_r,
-                                 uoff_t *log_file_offset_r);
+int mail_index_transaction_commit(struct mail_index_transaction **t);
+int mail_index_transaction_commit_get_pos(struct mail_index_transaction **t,
+                                         uint32_t *log_file_seq_r,
+                                         uoff_t *log_file_offset_r);
 void mail_index_transaction_rollback(struct mail_index_transaction **t);
 /* Discard all changes in the transaction. */
 void mail_index_transaction_reset(struct mail_index_transaction *t);

diff --git a/src/lib-storage/index/dbox/dbox-map.c b/src/lib-storage/index/dbox/dbox-map.c
index 768702c72a508e101adff8d83323bda45a18752c..aa1db545543052c7ee7e21787c9e231be99c21fe 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-map.c
+++ b/src/lib-storage/index/dbox/dbox-map.c
@@ -305,11 +305,7 @@ int dbox_map_update_refcounts(struct dbox_map *map,
                mail_index_transaction_rollback(&trans);
                return -1;
        } else {
-               uint32_t log_seq;
-               uoff_t log_offset;
-
-               if (mail_index_transaction_commit(&trans, &log_seq,
-                                                 &log_offset) < 0) {
+               if (mail_index_transaction_commit(&trans) < 0) {
                        mail_storage_set_internal_error(&map->storage->storage);
                        mail_index_reset_error(map->index);
                        return -1;
@@ -326,8 +322,6 @@ int dbox_map_remove_file_id(struct dbox_map *map, uint32_t file_id)
        const void *data;
        bool expunged;
        uint32_t seq;
-       uint32_t log_seq;
-       uoff_t log_offset;
 
        /* make sure the map is refreshed, otherwise we might be expunging
           messages that have already been moved to other files. */
@@ -347,7 +341,7 @@ int dbox_map_remove_file_id(struct dbox_map *map, uint32_t file_id)
                if (rec->file_id == file_id)
                        mail_index_expunge(trans, seq);
        }
-       if (mail_index_transaction_commit(&trans, &log_seq, &log_offset) < 0) {
+       if (mail_index_transaction_commit(&trans) < 0) {
                mail_storage_set_internal_error(&map->storage->storage);
                mail_index_reset_error(map->index);
                return -1;

diff --git a/src/lib-storage/index/dbox/dbox-sync-rebuild.c b/src/lib-storage/index/dbox/dbox-sync-rebuild.c
index 7fc1cbb3c61d6b470f811fc2d8d5f1d8663bc1fc..033e1d20d63cbf9affa370cbcc179a64c24c80cb 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-sync-rebuild.c
+++ b/src/lib-storage/index/dbox/dbox-sync-rebuild.c
@@ -412,8 +412,6 @@ static int dbox_sync_index_rebuild_ctx(struct dbox_sync_rebuild_context *ctx)
 int dbox_sync_index_rebuild(struct dbox_mailbox *mbox)
 {
        struct dbox_sync_rebuild_context ctx;
-       uint32_t seq;
-       uoff_t offset;
        int ret;
 
        memset(&ctx, 0, sizeof(ctx));
@@ -428,7 +426,7 @@ int dbox_sync_index_rebuild(struct dbox_mailbox *mbox)
        if ((ret = dbox_sync_index_rebuild_ctx(&ctx)) < 0)
                mail_index_transaction_rollback(&ctx.trans);
        else
-               ret = mail_index_transaction_commit(&ctx.trans, &seq, &offset);
+               ret = mail_index_transaction_commit(&ctx.trans);
        mail_index_view_close(&ctx.view);
 
        if (ctx.maildir_sync_ctx != NULL) {

diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
index 8bcd60fc6cca15bff24068618f985a888e5bccab..08371c72d789038c586789489811bc53020d5c14 100644 (file)
--- a/src/lib-storage/index/index-transaction.c
+++ b/src/lib-storage/index/index-transaction.c
@@ -95,8 +95,6 @@ int index_transaction_commit(struct mailbox_transaction_context *_t,
        struct index_transaction_context *t =
                (struct index_transaction_context *)_t;
        struct mail_index_transaction *itrans = t->trans;
-       uint32_t seq;
-       uoff_t offset;
 
        *uid_validity_r = 0;
        *first_saved_uid_r = *last_saved_uid_r = 0;
@@ -105,7 +103,7 @@ int index_transaction_commit(struct mailbox_transaction_context *_t,
        t->first_saved_uid = first_saved_uid_r;
        t->last_saved_uid = last_saved_uid_r;
 
-       return mail_index_transaction_commit(&itrans, &seq, &offset);
+       return mail_index_transaction_commit(&itrans);
 }
 
 void index_transaction_rollback(struct mailbox_transaction_context *_t)

diff --git a/src/lib-storage/list/index-mailbox-list-sync.c b/src/lib-storage/list/index-mailbox-list-sync.c
index 8bf05eb9f9158d1302fe85705401d67522c5deac..245178e5958fd90c3aa9c60b232ebb41a2cea5b7 100644 (file)
--- a/src/lib-storage/list/index-mailbox-list-sync.c
+++ b/src/lib-storage/list/index-mailbox-list-sync.c
@@ -258,8 +258,8 @@ index_list_update(struct index_mailbox_list *ilist, struct mailbox *box,
                return -1;
        }
 
-       return mail_index_transaction_commit(&trans, &ibox->log_seq,
-                                            &ibox->log_offset);
+       return mail_index_transaction_commit_get_pos(&trans, &ibox->log_seq,
+                                                    &ibox->log_offset);
 }
 
 static struct mailbox_sync_context *