dovecot-2.2: lib-storage: Renamed mail_storage_set_index_error()...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Oct 29 19:54:56 EET 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/5479887eb461
changeset: 15342:5479887eb461
user: Timo Sirainen <tss at iki.fi>
date: Mon Oct 29 19:54:50 2012 +0200
description:
lib-storage: Renamed mail_storage_set_index_error() to mailbox_set_index_error()
diffstat:
src/lib-storage/index/cydir/cydir-sync.c | 4 ++--
src/lib-storage/index/dbox-common/dbox-storage.c | 2 +-
src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 6 +++---
src/lib-storage/index/dbox-multi/mdbox-storage.c | 2 +-
src/lib-storage/index/dbox-multi/mdbox-sync.c | 4 ++--
src/lib-storage/index/dbox-single/sdbox-storage.c | 2 +-
src/lib-storage/index/dbox-single/sdbox-sync.c | 4 ++--
src/lib-storage/index/imapc/imapc-mailbox.c | 4 ++--
src/lib-storage/index/imapc/imapc-storage.c | 2 +-
src/lib-storage/index/imapc/imapc-sync.c | 4 ++--
src/lib-storage/index/index-storage.c | 4 ++--
src/lib-storage/index/index-sync-pvt.c | 6 +++---
src/lib-storage/index/index-sync.c | 2 +-
src/lib-storage/index/index-transaction.c | 2 +-
src/lib-storage/index/maildir/maildir-sync-index.c | 4 ++--
src/lib-storage/index/maildir/maildir-sync.c | 4 ++--
src/lib-storage/index/mbox/mbox-mail.c | 2 +-
src/lib-storage/index/mbox/mbox-sync.c | 8 ++++----
src/lib-storage/index/pop3c/pop3c-sync.c | 4 ++--
src/lib-storage/index/raw/raw-sync.c | 4 ++--
src/lib-storage/mail-storage-private.h | 2 +-
src/lib-storage/mail-storage.c | 4 ++--
src/plugins/virtual/virtual-sync.c | 4 ++--
23 files changed, 42 insertions(+), 42 deletions(-)
diffs (truncated from 447 to 300 lines):
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/cydir/cydir-sync.c
--- a/src/lib-storage/index/cydir/cydir-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/cydir/cydir-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -119,7 +119,7 @@
sync_flags);
if (ret <= 0) {
if (ret < 0)
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
i_free(ctx);
*ctx_r = NULL;
return ret;
@@ -138,7 +138,7 @@
*_ctx = NULL;
if (success) {
if (mail_index_sync_commit(&ctx->index_sync_ctx) < 0) {
- mail_storage_set_index_error(&ctx->mbox->box);
+ mailbox_set_index_error(&ctx->mbox->box);
ret = -1;
}
} else {
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-common/dbox-storage.c
--- a/src/lib-storage/index/dbox-common/dbox-storage.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c Mon Oct 29 19:54:50 2012 +0200
@@ -282,7 +282,7 @@
ret = mail_index_sync_begin(box->index, &sync_ctx, &view, &trans, 0);
if (ret <= 0) {
i_assert(ret != 0);
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
return -1;
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Mon Oct 29 19:54:50 2012 +0200
@@ -507,7 +507,7 @@
MAIL_INDEX_SYNC_FLAG_AVOID_FLAG_UPDATES);
if (ret <= 0) {
i_assert(ret != 0);
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
mailbox_free(&box);
return -1;
}
@@ -518,7 +518,7 @@
index_index_rebuild_deinit(&rebuild_ctx, dbox_get_uidvalidity_next);
if (mail_index_sync_commit(&sync_ctx) < 0) {
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
ret = -1;
}
@@ -674,7 +674,7 @@
&ctx->prev_msg.trans, 0);
if (ret <= 0) {
i_assert(ret != 0);
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
mailbox_free(&box);
return -1;
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-multi/mdbox-storage.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c Mon Oct 29 19:54:50 2012 +0200
@@ -304,7 +304,7 @@
mdbox_update_header(mbox, trans, update);
if (new_trans != NULL) {
if (mail_index_transaction_commit(&new_trans) < 0) {
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
return -1;
}
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-multi/mdbox-sync.c
--- a/src/lib-storage/index/dbox-multi/mdbox-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-multi/mdbox-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -197,7 +197,7 @@
if (mail_index_reset_fscked(mbox->box.index))
mdbox_storage_set_corrupted(mbox->storage);
if (ret < 0) {
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
return -1;
}
if (ret == 0) {
@@ -300,7 +300,7 @@
if (success) {
if (mail_index_sync_commit(&ctx->index_sync_ctx) < 0) {
- mail_storage_set_index_error(&ctx->mbox->box);
+ mailbox_set_index_error(&ctx->mbox->box);
ret = -1;
}
} else {
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-single/sdbox-storage.c
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c Mon Oct 29 19:54:50 2012 +0200
@@ -235,7 +235,7 @@
sdbox_update_header(mbox, trans, update);
if (new_trans != NULL) {
if (mail_index_transaction_commit(&new_trans) < 0) {
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
return -1;
}
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/dbox-single/sdbox-sync.c
--- a/src/lib-storage/index/dbox-single/sdbox-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/dbox-single/sdbox-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -213,7 +213,7 @@
sdbox_set_mailbox_corrupted(&mbox->box);
if (ret <= 0) {
if (ret < 0)
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
array_free(&ctx->expunged_uids);
i_free(ctx);
*ctx_r = NULL;
@@ -264,7 +264,7 @@
if (success) {
mail_index_view_ref(ctx->sync_view);
if (mail_index_sync_commit(&ctx->index_sync_ctx) < 0) {
- mail_storage_set_index_error(&ctx->mbox->box);
+ mailbox_set_index_error(&ctx->mbox->box);
ret = -1;
} else {
dbox_sync_expunge_files(ctx);
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/imapc/imapc-mailbox.c
--- a/src/lib-storage/index/imapc/imapc-mailbox.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c Mon Oct 29 19:54:50 2012 +0200
@@ -70,7 +70,7 @@
array_clear(&mbox->delayed_expunged_uids);
ret = mail_index_transaction_commit(&trans);
if (ret < 0)
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
return ret;
}
@@ -85,7 +85,7 @@
mail_index_view_close(&mbox->delayed_sync_view);
if (mbox->delayed_sync_trans != NULL) {
if (mail_index_transaction_commit(&mbox->delayed_sync_trans) < 0) {
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
ret = -1;
}
*changes_r = TRUE;
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/imapc/imapc-storage.c
--- a/src/lib-storage/index/imapc/imapc-storage.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/imapc/imapc-storage.c Mon Oct 29 19:54:50 2012 +0200
@@ -523,7 +523,7 @@
mail_index_view_close(&mbox->delayed_sync_view);
if (mbox->delayed_sync_trans != NULL) {
if (mail_index_transaction_commit(&mbox->delayed_sync_trans) < 0)
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
}
if (mbox->sync_view != NULL)
mail_index_view_close(&mbox->sync_view);
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/imapc/imapc-sync.c
--- a/src/lib-storage/index/imapc/imapc-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/imapc/imapc-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -377,7 +377,7 @@
sync_flags);
if (ret <= 0) {
if (ret < 0)
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
i_free(ctx);
*ctx_r = NULL;
return ret;
@@ -412,7 +412,7 @@
*_ctx = NULL;
if (ret == 0) {
if (mail_index_sync_commit(&ctx->index_sync_ctx) < 0) {
- mail_storage_set_index_error(&ctx->mbox->box);
+ mailbox_set_index_error(&ctx->mbox->box);
ret = -1;
}
} else {
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/index-storage.c Mon Oct 29 19:54:50 2012 +0200
@@ -239,7 +239,7 @@
if (ret <= 0 || move_to_memory) {
if ((index_flags & MAIL_INDEX_OPEN_FLAG_NEVER_IN_MEMORY) != 0) {
i_assert(ret <= 0);
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
return -1;
}
@@ -469,7 +469,7 @@
}
if ((ret = mail_index_transaction_commit(&trans)) < 0)
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
mail_index_view_close(&view);
return ret;
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/index-sync-pvt.c
--- a/src/lib-storage/index/index-sync-pvt.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/index-sync-pvt.c Mon Oct 29 19:54:50 2012 +0200
@@ -119,7 +119,7 @@
/* open a view for the latest version of the index */
if (mail_index_refresh(box->index) < 0) {
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
return -1;
}
view_shared = mail_index_view_open(box->index);
@@ -140,7 +140,7 @@
if (mail_index_sync_begin(box->index_pvt, &sync_ctx,
&view_pvt, &trans_pvt, 0) < 0) {
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
mail_index_view_close(&view_shared);
return -1;
}
@@ -198,7 +198,7 @@
}
if ((ret = mail_index_sync_commit(&sync_ctx)) < 0)
- mail_storage_set_index_error(box);
+ mailbox_set_index_error(box);
mail_index_view_close(&view_shared);
return ret;
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/index-sync.c
--- a/src/lib-storage/index/index-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/index-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -369,7 +369,7 @@
if (ctx->sync_ctx != NULL) {
if (mail_index_view_sync_commit(&ctx->sync_ctx,
&delayed_expunges) < 0) {
- mail_storage_set_index_error(_ctx->box);
+ mailbox_set_index_error(_ctx->box);
ret = -1;
}
}
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/index-transaction.c
--- a/src/lib-storage/index/index-transaction.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/index-transaction.c Mon Oct 29 19:54:50 2012 +0200
@@ -40,7 +40,7 @@
t->super.rollback(index_trans);
else {
if (t->super.commit(index_trans, result_r) < 0) {
- mail_storage_set_index_error(t->box);
+ mailbox_set_index_error(t->box);
ret = -1;
} else if (result_r->commit_size > 0) {
/* something was written to the transaction log */
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/maildir/maildir-sync-index.c
--- a/src/lib-storage/index/maildir/maildir-sync-index.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/maildir/maildir-sync-index.c Mon Oct 29 19:54:50 2012 +0200
@@ -229,7 +229,7 @@
if (mail_index_sync_begin(_box->index, &sync_ctx, &view,
&trans, sync_flags) < 0) {
- mail_storage_set_index_error(_box);
+ mailbox_set_index_error(_box);
return -1;
}
@@ -328,7 +328,7 @@
start a second index sync and crash. */
mbox->syncing_commit = TRUE;
if (mail_index_sync_commit(&ctx->sync_ctx) < 0) {
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
ret = -1;
}
mbox->syncing_commit = FALSE;
diff -r 15dfd6475f64 -r 5479887eb461 src/lib-storage/index/maildir/maildir-sync.c
--- a/src/lib-storage/index/maildir/maildir-sync.c Mon Oct 29 19:52:21 2012 +0200
+++ b/src/lib-storage/index/maildir/maildir-sync.c Mon Oct 29 19:54:50 2012 +0200
@@ -569,7 +569,7 @@
int maildir_sync_header_refresh(struct maildir_mailbox *mbox)
{
if (mail_index_refresh(mbox->box.index) < 0) {
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
return -1;
}
maildir_sync_get_header(mbox);
@@ -1006,7 +1006,7 @@
sync_ctx = mail_index_view_sync_begin(mbox->flags_view,
MAIL_INDEX_VIEW_SYNC_FLAG_FIX_INCONSISTENT);
if (mail_index_view_sync_commit(&sync_ctx, &delayed_expunges) < 0) {
- mail_storage_set_index_error(&mbox->box);
+ mailbox_set_index_error(&mbox->box);
return -1;
}
/* make sure the map stays in private memory */
More information about the dovecot-cvs
mailing list