From d59f44917f9862d3f95d7c95885b6f50e802ae38 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 30 Jul 2009 19:11:33 -0400 Subject: [PATCH] Removed duplicated flags from struct index_transaction_context. --HG-- branch : HEAD --- src/lib-storage/index/cydir/cydir-save.c | 2 +- src/lib-storage/index/dbox/dbox-save.c | 2 +- src/lib-storage/index/index-storage.h | 1 - src/lib-storage/index/index-transaction.c | 1 - src/lib-storage/index/maildir/maildir-copy.c | 5 +++-- src/lib-storage/index/maildir/maildir-save.c | 9 ++++----- src/lib-storage/index/mbox/mbox-save.c | 5 +++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/lib-storage/index/cydir/cydir-save.c b/src/lib-storage/index/cydir/cydir-save.c index aa951fe26d..99a416d79a 100644 --- 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 25842b755f..935f5cb004 100644 --- 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 5dd939cad4..c1d599df41 100644 --- 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 386f01f8ef..5c0ec0e332 100644 --- 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 11b9b198a3..fb9875b6c5 100644 --- 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 839ec53259..65ef6916f2 100644 --- 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 f4dd56ad4b..e4a756b374 100644 --- 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; -- 2.47.3