Mercurial > dovecot > core-2.2
changeset 9704:f704410ce580 HEAD
index-storage: Code cleanups.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 30 Jul 2009 19:52:41 -0400 |
| parents | 1b537cceb640 |
| children | 497b17e8bb91 |
| files | src/lib-storage/index/cydir/cydir-save.c src/lib-storage/index/dbox/dbox-save.c src/lib-storage/index/index-mail.c src/lib-storage/index/index-search.c src/lib-storage/index/index-storage.h src/lib-storage/index/index-transaction.c src/lib-storage/index/maildir/maildir-copy.c src/lib-storage/index/maildir/maildir-save.c src/lib-storage/index/mbox/mbox-save.c src/lib-storage/index/mbox/mbox-transaction.c |
| diffstat | 10 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/cydir/cydir-save.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/cydir/cydir-save.c Thu Jul 30 19:52:41 2009 -0400 @@ -61,7 +61,7 @@ { struct cydir_transaction_context *t = (struct cydir_transaction_context *)_t; - struct cydir_mailbox *mbox = (struct cydir_mailbox *)t->ictx.ibox; + struct cydir_mailbox *mbox = (struct cydir_mailbox *)_t->box; struct cydir_save_context *ctx = t->save_ctx; i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
--- a/src/lib-storage/index/dbox/dbox-save.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/dbox/dbox-save.c Thu Jul 30 19:52:41 2009 -0400 @@ -58,7 +58,7 @@ { struct dbox_transaction_context *t = (struct dbox_transaction_context *)_t; - struct dbox_mailbox *mbox = (struct dbox_mailbox *)t->ictx.ibox; + struct dbox_mailbox *mbox = (struct dbox_mailbox *)_t->box; struct dbox_save_context *ctx; i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
--- a/src/lib-storage/index/index-mail.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/index-mail.c Thu Jul 30 19:52:41 2009 -0400 @@ -1069,6 +1069,7 @@ enum mail_fetch_field wanted_fields, struct mailbox_header_lookup_ctx *_wanted_headers) { + struct index_mailbox *ibox = (struct index_mailbox *)_t->box; struct index_transaction_context *t = (struct index_transaction_context *)_t; struct index_header_lookup_ctx *wanted_headers = @@ -1078,18 +1079,18 @@ array_create(&mail->mail.module_contexts, mail->mail.pool, sizeof(void *), 5); - mail->mail.v = *t->ibox->mail_vfuncs; - mail->mail.mail.box = &t->ibox->box; + mail->mail.v = *ibox->mail_vfuncs; + mail->mail.mail.box = &ibox->box; mail->mail.mail.transaction = &t->mailbox_ctx; mail->mail.wanted_fields = wanted_fields; mail->mail.wanted_headers = _wanted_headers; - hdr = mail_index_get_header(t->ibox->view); + hdr = mail_index_get_header(ibox->view); mail->uid_validity = hdr->uid_validity; t->mail_ref_count++; mail->data_pool = pool_alloconly_create("index_mail", 16384); - mail->ibox = t->ibox; + mail->ibox = ibox; mail->trans = t; mail->wanted_fields = wanted_fields; if (wanted_headers != NULL) {
--- a/src/lib-storage/index/index-search.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/index-search.c Thu Jul 30 19:52:41 2009 -0400 @@ -1012,7 +1012,7 @@ ctx = i_new(struct index_search_context, 1); ctx->mail_ctx.transaction = _t; - ctx->ibox = t->ibox; + ctx->ibox = (struct index_mailbox *)_t->box; ctx->view = t->trans_view; ctx->mail_ctx.args = args; ctx->mail_ctx.sort_program = index_sort_program_init(_t, sort_program); @@ -1020,7 +1020,7 @@ if (gettimeofday(&ctx->last_nonblock_timeval, NULL) < 0) i_fatal("gettimeofday() failed: %m"); - hdr = mail_index_get_header(t->ibox->view); + hdr = mail_index_get_header(ctx->ibox->view); ctx->mail_ctx.progress_max = hdr->messages_count; i_array_init(&ctx->mail_ctx.results, 5);
--- a/src/lib-storage/index/index-storage.h Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/index-storage.h Thu Jul 30 19:52:41 2009 -0400 @@ -45,8 +45,6 @@ /* we've discovered there aren't enough permissions to modify mailbox */ unsigned int backend_readonly:1; - unsigned int sent_diskspace_warning:1; - unsigned int sent_readonly_flags_warning:1; unsigned int notify_pending:1; unsigned int move_to_memory:1; }; @@ -54,16 +52,12 @@ struct index_transaction_context { struct mailbox_transaction_context mailbox_ctx; struct mail_index_transaction_vfuncs super; - - struct index_mailbox *ibox; int mail_ref_count; struct mail_index_transaction *trans; struct mail_index_view *trans_view; struct mail_cache_view *cache_view; struct mail_cache_transaction_ctx *cache_trans; - - unsigned int cache_trans_failed:1; }; void mail_storage_set_index_error(struct index_mailbox *ibox);
--- a/src/lib-storage/index/index-transaction.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/index-transaction.c Thu Jul 30 19:52:41 2009 -0400 @@ -9,7 +9,6 @@ struct index_mailbox *ibox) { t->mailbox_ctx.box = &ibox->box; - t->ibox = ibox; array_create(&t->mailbox_ctx.module_contexts, default_pool, sizeof(void *), 5); @@ -34,13 +33,14 @@ uint32_t *log_file_seq_r, uoff_t *log_file_offset_r) { + struct index_mailbox *ibox = (struct index_mailbox *)t->mailbox_ctx.box; int ret; i_assert(t->mail_ref_count == 0); ret = t->super.commit(t->trans, log_file_seq_r, log_file_offset_r); if (ret < 0) - mail_storage_set_index_error(t->ibox); + mail_storage_set_index_error(ibox); index_transaction_free(t); return ret;
--- a/src/lib-storage/index/maildir/maildir-copy.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/maildir/maildir-copy.c Thu Jul 30 19:52:41 2009 -0400 @@ -213,7 +213,8 @@ struct mailbox_transaction_context *_t = ctx->transaction; struct maildir_transaction_context *t = (struct maildir_transaction_context *)_t; - struct maildir_mailbox *mbox = (struct maildir_mailbox *)t->ictx.ibox; + struct maildir_mailbox *mbox = + (struct maildir_mailbox *)t->ictx.mailbox_ctx.box; int ret; i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
--- a/src/lib-storage/index/maildir/maildir-save.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/maildir/maildir-save.c Thu Jul 30 19:52:41 2009 -0400 @@ -108,7 +108,8 @@ struct maildir_save_context * maildir_save_transaction_init(struct maildir_transaction_context *t) { - struct maildir_mailbox *mbox = (struct maildir_mailbox *)t->ictx.ibox; + struct maildir_mailbox *mbox = + (struct maildir_mailbox *)t->ictx.mailbox_ctx.box; struct maildir_save_context *ctx; pool_t pool;
--- a/src/lib-storage/index/mbox/mbox-save.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/mbox/mbox-save.c Thu Jul 30 19:52:41 2009 -0400 @@ -172,7 +172,8 @@ static void mbox_save_init_sync(struct mbox_transaction_context *t) { - struct mbox_mailbox *mbox = (struct mbox_mailbox *)t->ictx.ibox; + struct mbox_mailbox *mbox = + (struct mbox_mailbox *)t->ictx.mailbox_ctx.box; struct mbox_save_context *ctx = t->save_ctx; const struct mail_index_header *hdr; struct mail_index_view *view; @@ -414,7 +415,7 @@ { struct mbox_transaction_context *t = (struct mbox_transaction_context *)_t; - struct mbox_mailbox *mbox = (struct mbox_mailbox *)t->ictx.ibox; + struct mbox_mailbox *mbox = (struct mbox_mailbox *)_t->box; struct mbox_save_context *ctx; i_assert((_t->flags & MAILBOX_TRANSACTION_FLAG_EXTERNAL) != 0);
--- a/src/lib-storage/index/mbox/mbox-transaction.c Thu Jul 30 19:42:41 2009 -0400 +++ b/src/lib-storage/index/mbox/mbox-transaction.c Thu Jul 30 19:52:41 2009 -0400 @@ -14,7 +14,8 @@ uoff_t *log_file_offset_r) { struct mbox_transaction_context *mt = MAIL_STORAGE_CONTEXT(t); - struct mbox_mailbox *mbox = (struct mbox_mailbox *)mt->ictx.ibox; + struct mbox_mailbox *mbox = + (struct mbox_mailbox *)mt->ictx.mailbox_ctx.box; unsigned int lock_id = mt->mbox_lock_id; bool mails_saved; int ret = 0; @@ -62,7 +63,8 @@ static void mbox_transaction_rollback(struct mail_index_transaction *t) { struct mbox_transaction_context *mt = MAIL_STORAGE_CONTEXT(t); - struct mbox_mailbox *mbox = (struct mbox_mailbox *)mt->ictx.ibox; + struct mbox_mailbox *mbox = + (struct mbox_mailbox *)mt->ictx.mailbox_ctx.box; if (mt->save_ctx != NULL) mbox_transaction_save_rollback(mt->save_ctx);