Expunge fixes

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/mbox/mbox-mail.c b/src/lib-storage/index/mbox/mbox-mail.c
index c5f424c46ec408c9ba0cce000871f15a932b1693..29a2988841caecb5fc3c13612263f611b0e23e9d 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-mail.c
+++ b/src/lib-storage/index/mbox/mbox-mail.c
@@ -17,6 +17,7 @@ static int mbox_mail_seek(struct index_mail *mail)
        struct index_mailbox *ibox = mail->ibox;
        const void *data;
        uint64_t offset;
+       int ret;
 
        if (ibox->mbox_lock_type == F_UNLCK) {
                if (mbox_sync(ibox, FALSE, FALSE, TRUE) < 0)
@@ -29,9 +30,11 @@ static int mbox_mail_seek(struct index_mail *mail)
        if (mbox_file_open_stream(ibox) < 0)
                return -1;
 
-       if (mail_index_lookup_extra(ibox->view, mail->mail.seq,
-                                   ibox->mbox_extra_idx, &data) < 0) {
-               mail_storage_set_index_error(ibox);
+       ret = mail_index_lookup_extra(ibox->view, mail->mail.seq,
+                                     ibox->mbox_extra_idx, &data);
+       if (ret <= 0) {
+               if (ret < 0)
+                       mail_storage_set_index_error(ibox);
                return -1;
        }
 

diff --git a/src/lib-storage/index/mbox/mbox-sync.c b/src/lib-storage/index/mbox/mbox-sync.c
index 0d4872da394c961e6e3a214037c42bc7fb806606..b951e62c281897ebbfebb9a604e252d9e9639a8e 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-sync.c
+++ b/src/lib-storage/index/mbox/mbox-sync.c
@@ -377,10 +377,9 @@ mbox_sync_update_from_offset(struct mbox_sync_context *sync_ctx,
 
                if (offset == mail->from_offset)
                        return 0;
-       } else {
-               offset = mail->from_offset;
        }
 
+       offset = mail->from_offset;
        mail_index_update_extra_rec(sync_ctx->t, sync_ctx->idx_seq,
                                    sync_ctx->ibox->mbox_extra_idx, &offset);
        return 0;