Removed duplicated flags from struct index_transaction_context.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/cydir/cydir-save.c b/src/lib-storage/index/cydir/cydir-save.c
index aa951fe26d53258246a04e33820afef5bb862ab0..99a416d79a92b8cf717ac12926ffdd147ba13b2d 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-save.c
+++ b/src/lib-storage/index/cydir/cydir-save.c
@@ -64,7 +64,7 @@ cydir_save_alloc(struct mailbox_transaction_context *_t)
        struct cydir_mailbox *mbox = (struct cydir_mailbox *)t->ictx.ibox;
        struct cydir_save_context *ctx = t->save_ctx;
 
-       i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
+       i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
 
        if (t->save_ctx != NULL)
                return &t->save_ctx->ctx;

diff --git a/src/lib-storage/index/dbox/dbox-save.c b/src/lib-storage/index/dbox/dbox-save.c
index 25842b755fa04bf5a5c69e4b091da31a08cd93e4..935f5cb004a8b2135b7842c5b188403900a9371b 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-save.c
+++ b/src/lib-storage/index/dbox/dbox-save.c
@@ -61,7 +61,7 @@ dbox_save_alloc(struct mailbox_transaction_context *_t)
        struct dbox_mailbox *mbox = (struct dbox_mailbox *)t->ictx.ibox;
        struct dbox_save_context *ctx;
 
-       i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
+       i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
 
        if (t->save_ctx != NULL) {
                /* use the existing allocated structure */

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index 5dd939cad4639fd68a9a25909776f1f65f7cf61c..c1d599df41cab0fdbe20415e8299c0d42b92c600 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -64,7 +64,6 @@ struct index_transaction_context {
        struct mail_index_transaction_vfuncs super;
 
        struct index_mailbox *ibox;
-       enum mailbox_transaction_flags flags;
        int mail_ref_count;
 
        struct mail_index_transaction *trans;

diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
index 386f01f8ef2bdf1a521182d665e306926e8b6ed7..5c0ec0e33292777fd781189e77707ddac0c60b50 100644 (file)
--- a/src/lib-storage/index/index-transaction.c
+++ b/src/lib-storage/index/index-transaction.c
@@ -85,7 +85,6 @@ index_transaction_begin(struct mailbox *box,
                i_panic("mail storage transaction context mising for type %s",
                        box->storage->name);
        }
-       it->flags = flags;
        return &it->mailbox_ctx;
 }
 

diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index 11b9b198a36599d72adcd7d5a5b2de3d99ef3af0..fb9875b6c54b1c3566be5970027a7a59cbe692f2 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -210,12 +210,13 @@ maildir_compatible_file_modes(struct mailbox *box1, struct mailbox *box2)
 
 int maildir_copy(struct mail_save_context *ctx, struct mail *mail)
 {
+       struct mailbox_transaction_context *_t = ctx->transaction;
        struct maildir_transaction_context *t =
-               (struct maildir_transaction_context *)ctx->transaction;
+               (struct maildir_transaction_context *)_t;
        struct maildir_mailbox *mbox = (struct maildir_mailbox *)t->ictx.ibox;
        int ret;
 
-       i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
+       i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
 
        if (mbox->storage->set->maildir_copy_with_hardlinks &&
            maildir_compatible_file_modes(&mbox->ibox.box, mail->box)) {

diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index 839ec5325980aa5959d30e82eb2b60d5598caf6e..65ef6916f21a45d402f41c1a096869c2c20166eb 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -365,7 +365,7 @@ maildir_save_alloc(struct mailbox_transaction_context *_t)
        struct maildir_transaction_context *t =
                (struct maildir_transaction_context *)_t;
 
-       i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
+       i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
 
        if (t->save_ctx == NULL)
                t->save_ctx = maildir_save_transaction_init(t);
@@ -765,8 +765,7 @@ static void maildir_save_sync_uidlist(struct maildir_save_context *ctx)
 
 int maildir_transaction_save_commit_pre(struct maildir_save_context *ctx)
 {
-       struct maildir_transaction_context *t =
-               (struct maildir_transaction_context *)ctx->ctx.transaction;
+       struct mailbox_transaction_context *_t = ctx->ctx.transaction;
        struct maildir_filename *last_mf;
        enum maildir_uidlist_sync_flags sync_flags;
        int ret;
@@ -777,7 +776,7 @@ int maildir_transaction_save_commit_pre(struct maildir_save_context *ctx)
        sync_flags = MAILDIR_UIDLIST_SYNC_PARTIAL |
                MAILDIR_UIDLIST_SYNC_NOREFRESH;
 
-       if ((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS) != 0) {
+       if ((_t->flags & MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS) != 0) {
                /* we want to assign UIDs, we must lock uidlist */
        } else if (ctx->have_keywords) {
                /* keywords file updating relies on uidlist lock. */
@@ -818,7 +817,7 @@ int maildir_transaction_save_commit_pre(struct maildir_save_context *ctx)
                        ret = -1;
        }
 
-       t->ictx.mailbox_ctx.changes->uid_validity =
+       _t->changes->uid_validity =
                maildir_uidlist_get_uid_validity(ctx->mbox->uidlist);
 
        if (ctx->mail != NULL) {

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index f4dd56ad4bddfe544a707aeaa456e962d74a9293..e4a756b374560162b371eda53b0bb9b4af0d6d58 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -251,6 +251,7 @@ static int
 mbox_save_init_file(struct mbox_save_context *ctx,
                    struct mbox_transaction_context *t, bool want_mail)
 {
+       struct mailbox_transaction_context *_t = &t->ictx.mailbox_ctx;
        struct mbox_mailbox *mbox = ctx->mbox;
        struct mail_storage *storage = &mbox->storage->storage;
        bool empty = FALSE;
@@ -262,7 +263,7 @@ mbox_save_init_file(struct mbox_save_context *ctx,
                return -1;
        }
 
-       if ((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS) != 0)
+       if ((_t->flags & MAILBOX_TRANSACTION_FLAG_ASSIGN_UIDS) != 0)
                want_mail = TRUE;
 
        if (ctx->append_offset == (uoff_t)-1) {
@@ -416,7 +417,7 @@ mbox_save_alloc(struct mailbox_transaction_context *_t)
        struct mbox_mailbox *mbox = (struct mbox_mailbox *)t->ictx.ibox;
        struct mbox_save_context *ctx;
 
-       i_assert((t->ictx.flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
+       i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
 
        if (t->save_ctx != NULL)
                return &t->save_ctx->ctx;