From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Apr 2010 20:02:12 +0000 (+0300)
Subject: sdbox: Removed unused code.
X-Git-Tag: 2.0.beta5~249
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b7f41ed4e3091d9a53c1db1d0b202cf332c4c15;p=thirdparty%2Fdovecot%2Fcore.git

sdbox: Removed unused code.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.h b/src/lib-storage/index/dbox-single/sdbox-storage.h
index df1052d5d8..e1f422a33f 100644
--- a/src/lib-storage/index/dbox-single/sdbox-storage.h
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.h
@@ -30,7 +30,6 @@ struct sdbox_mailbox {
 	uint32_t hdr_ext_id;
 
 	unsigned int creating:1;
-	unsigned int sync_rebuild:1;
 };
 
 extern struct mail_vfuncs sdbox_mail_vfuncs;
diff --git a/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c b/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c
index 416df21441..62145a54eb 100644
--- a/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c
+++ b/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c
@@ -176,8 +176,5 @@ int sdbox_sync_index_rebuild(struct sdbox_mailbox *mbox)
 	else
 		ret = mail_index_transaction_commit(&trans);
 	mail_index_view_close(&view);
-
-	if (ret == 0)
-		mbox->sync_rebuild = FALSE;
 	return ret;
 }
diff --git a/src/lib-storage/index/dbox-single/sdbox-sync.c b/src/lib-storage/index/dbox-single/sdbox-sync.c
index 1e698517bb..4fb1341dea 100644
--- a/src/lib-storage/index/dbox-single/sdbox-sync.c
+++ b/src/lib-storage/index/dbox-single/sdbox-sync.c
@@ -153,9 +153,7 @@ sdbox_refresh_header(struct sdbox_mailbox *mbox, bool retry, bool log_error)
 	ret = sdbox_read_header(mbox, &hdr, log_error);
 	mail_index_view_close(&view);
 
-	if (ret == 0) {
-		ret = mbox->sync_rebuild ? -1 : 0;
-	} else if (retry) {
+	if (ret < 0 && retry) {
 		(void)mail_index_refresh(mbox->box.index);
 		return sdbox_refresh_header(mbox, FALSE, log_error);
 	}
@@ -280,8 +278,7 @@ sdbox_storage_sync_init(struct mailbox *box, enum mailbox_sync_flags flags)
 			ret = -1;
 	}
 
-	if (ret == 0 && (index_mailbox_want_full_sync(&mbox->box, flags) ||
-			 mbox->sync_rebuild)) {
+	if (ret == 0 && index_mailbox_want_full_sync(&mbox->box, flags)) {
 		if ((flags & MAILBOX_SYNC_FLAG_FORCE_RESYNC) != 0)
 			sdbox_sync_flags |= SDBOX_SYNC_FLAG_FORCE_REBUILD;
 		ret = sdbox_sync(mbox, sdbox_sync_flags);