Mercurial > dovecot > core-2.2
changeset 11025:1e118fd825c7 HEAD
sdbox: Removed unused code.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 04 Apr 2010 23:02:12 +0300 |
| parents | d16bfa082e88 |
| children | cf302ede55bc |
| files | src/lib-storage/index/dbox-single/sdbox-storage.h src/lib-storage/index/dbox-single/sdbox-sync-rebuild.c src/lib-storage/index/dbox-single/sdbox-sync.c |
| diffstat | 3 files changed, 2 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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; }
--- 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);