dovecot-2.0: Removed duplicated flags from struct index_transact...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Jul 31 02:11:42 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/f123bb8afd1c
changeset: 9699:f123bb8afd1c
user: Timo Sirainen <tss at iki.fi>
date: Thu Jul 30 19:11:33 2009 -0400
description:
Removed duplicated flags from struct index_transaction_context.
diffstat:
7 files changed, 12 insertions(+), 13 deletions(-)
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 +++--
diffs (134 lines):
diff -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/cydir/cydir-save.c
--- a/src/lib-storage/index/cydir/cydir-save.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/cydir/cydir-save.c Thu Jul 30 19:11:33 2009 -0400
@@ -64,7 +64,7 @@ cydir_save_alloc(struct mailbox_transact
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 -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/dbox/dbox-save.c
--- a/src/lib-storage/index/dbox/dbox-save.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/dbox/dbox-save.c Thu Jul 30 19:11:33 2009 -0400
@@ -61,7 +61,7 @@ dbox_save_alloc(struct mailbox_transacti
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 -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/index-storage.h
--- a/src/lib-storage/index/index-storage.h Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/index-storage.h Thu Jul 30 19:11:33 2009 -0400
@@ -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 -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/index-transaction.c
--- a/src/lib-storage/index/index-transaction.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/index-transaction.c Thu Jul 30 19:11:33 2009 -0400
@@ -85,7 +85,6 @@ index_transaction_begin(struct mailbox *
i_panic("mail storage transaction context mising for type %s",
box->storage->name);
}
- it->flags = flags;
return &it->mailbox_ctx;
}
diff -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/maildir/maildir-copy.c
--- a/src/lib-storage/index/maildir/maildir-copy.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-copy.c Thu Jul 30 19:11:33 2009 -0400
@@ -210,12 +210,13 @@ maildir_compatible_file_modes(struct mai
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 -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-save.c Thu Jul 30 19:11:33 2009 -0400
@@ -365,7 +365,7 @@ maildir_save_alloc(struct mailbox_transa
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(st
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(
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(
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 -r 37bdd5ce828f -r f123bb8afd1c src/lib-storage/index/mbox/mbox-save.c
--- a/src/lib-storage/index/mbox/mbox-save.c Thu Jul 30 18:49:40 2009 -0400
+++ b/src/lib-storage/index/mbox/mbox-save.c Thu Jul 30 19:11:33 2009 -0400
@@ -251,6 +251,7 @@ mbox_save_init_file(struct mbox_save_con
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_con
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_transacti
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;
More information about the dovecot-cvs
mailing list