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 df1052d5d8ddfff403b723af87e068ade4d6a2b2..e1f422a33f8c5427d5ed6d9af65ca4dd2f43c44a 100644 (file)
--- 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 416df214416ec5debca98dd24ed04107c75c3c74..62145a54ebe19ba82450564bd59d62acc475e01f 100644 (file)
--- 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 1e698517bb6cd003dcdab72432d1ff71e9ff4fe9..4fb1341dea23c02a64877be87f660346bb1ddef0 100644 (file)
--- 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);