dovecot-2.0: sdbox: Removed unused code.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/1e118fd825c7
changeset: 11025:1e118fd825c7
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Apr 04 23:02:12 2010 +0300
description:
sdbox: Removed unused code.

diffstat:

 src/lib-storage/index/dbox-single/sdbox-storage.h      |  1 -
 src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c |  3 ---
 src/lib-storage/index/dbox-single/sdbox-sync.c         |  7 ++-----
 3 files changed, 2 insertions(+), 9 deletions(-)

diffs (47 lines):

diff -r d16bfa082e88 -r 1e118fd825c7 src/lib-storage/index/dbox-single/sdbox-storage.h
--- a/src/lib-storage/index/dbox-single/sdbox-storage.h	Sun Apr 04 23:01:23 2010 +0300
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.h	Sun Apr 04 23:02:12 2010 +0300
@@ -30,7 +30,6 @@
 	uint32_t hdr_ext_id;
 
 	unsigned int creating:1;
-	unsigned int sync_rebuild:1;
 };
 
 extern struct mail_vfuncs sdbox_mail_vfuncs;
diff -r d16bfa082e88 -r 1e118fd825c7 src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c
--- a/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c	Sun Apr 04 23:01:23 2010 +0300
+++ b/src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c	Sun Apr 04 23:02:12 2010 +0300
@@ -176,8 +176,5 @@
 	else
 		ret = mail_index_transaction_commit(&trans);
 	mail_index_view_close(&view);
-
-	if (ret == 0)
-		mbox->sync_rebuild = FALSE;
 	return ret;
 }
diff -r d16bfa082e88 -r 1e118fd825c7 src/lib-storage/index/dbox-single/sdbox-sync.c
--- a/src/lib-storage/index/dbox-single/sdbox-sync.c	Sun Apr 04 23:01:23 2010 +0300
+++ b/src/lib-storage/index/dbox-single/sdbox-sync.c	Sun Apr 04 23:02:12 2010 +0300
@@ -153,9 +153,7 @@
 	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 @@
 			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);