From: Timo Sirainen <tss@iki.fi>
Date: Sun, 20 Jun 2004 04:18:12 +0000 (+0300)
Subject: Expunge fixes
X-Git-Tag: 1.1.alpha1~3914
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af07808ba203f8709e2ff9eaf2291e1c4a4d53d;p=thirdparty%2Fdovecot%2Fcore.git

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 c5f424c46e..29a2988841 100644
--- 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 0d4872da39..b951e62c28 100644
--- 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;