index-storage: Code cleanups.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/cydir/cydir-save.c b/src/lib-storage/index/cydir/cydir-save.c
index 99a416d79a92b8cf717ac12926ffdd147ba13b2d..62f13d53ed3f7574bf2d33924f00f1161620fa7c 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-save.c
+++ b/src/lib-storage/index/cydir/cydir-save.c
@@ -61,7 +61,7 @@ cydir_save_alloc(struct mailbox_transaction_context *_t)
 {
        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);

diff --git a/src/lib-storage/index/dbox/dbox-save.c b/src/lib-storage/index/dbox/dbox-save.c
index 935f5cb004a8b2135b7842c5b188403900a9371b..c00d5ffe6c52ceee81fb5c037d75e3f6e00685c0 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-save.c
+++ b/src/lib-storage/index/dbox/dbox-save.c
@@ -58,7 +58,7 @@ dbox_save_alloc(struct mailbox_transaction_context *_t)
 {
        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);

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index d886ac6266f1a90073ead682a1122276064bd26d..f5632c3898d50476ccf766440aec224dac389b08 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1069,6 +1069,7 @@ void index_mail_init(struct index_mail *mail,
                     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 @@ void index_mail_init(struct index_mail *mail,
        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) {

diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index 8afd4173383ac2b0b2498a40f36a95c04e47adb9..364c3f48934a93ff4e6b502dbd6e0f4a3879e784 100644 (file)
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -1012,7 +1012,7 @@ index_storage_search_init(struct mailbox_transaction_context *_t,
 
        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 @@ index_storage_search_init(struct mailbox_transaction_context *_t,
        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);

diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index f075e43daccd9924913e42ac5bd3d616809870f3..000f3f6e87280453bcb2a4ccf6dbb20908654403 100644 (file)
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -45,8 +45,6 @@ struct index_mailbox {
 
        /* 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_mailbox {
 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);

diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c
index 45ef9f9e4b96c75aaee2cd935a5cd7f572d876bd..e3ede01e60ee9a2e763b878381e58c60d37a6cdf 100644 (file)
--- a/src/lib-storage/index/index-transaction.c
+++ b/src/lib-storage/index/index-transaction.c
@@ -9,7 +9,6 @@ void index_transaction_init(struct index_transaction_context *t,
                            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 @@ int index_transaction_finish_commit(struct index_transaction_context *t,
                                    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;

diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index fb9875b6c54b1c3566be5970027a7a59cbe692f2..6cda964728ccce1ec37cd79adb6a3f6f9c8c6615 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -213,7 +213,8 @@ 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 *)_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);

diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index 0528b1c1437a89b7a9e639498bab31a3f10828a9..42e190238cf854e193e25c0c294fc75a8bcb5769 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -108,7 +108,8 @@ static int maildir_file_move(struct maildir_save_context *ctx,
 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;
 

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index f96017cf069c781a0e8f4a38a850dabb4080849a..5739b36bb811d02be1e7c0fc5100b2f035365321 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -172,7 +172,8 @@ static int mbox_write_content_length(struct mbox_save_context *ctx)
 
 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 @@ mbox_save_alloc(struct mailbox_transaction_context *_t)
 {
        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);

diff --git a/src/lib-storage/index/mbox/mbox-transaction.c b/src/lib-storage/index/mbox/mbox-transaction.c
index 572fdb484af2123f2d596474e492297863f971c4..27b1e48b1ca56eb5373bdcbb7ea5297e2518cb6e 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-transaction.c
+++ b/src/lib-storage/index/mbox/mbox-transaction.c
@@ -14,7 +14,8 @@ static int mbox_transaction_commit(struct mail_index_transaction *t,
                                   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 int mbox_transaction_commit(struct mail_index_transaction *t,
 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);