Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6706:4f999ac56a53 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code cleanup
author Timo Sirainen <tss@iki.fi>
date Tue, 06 Nov 2007 21:26:02 +0200
parents 68bb5bec043e
children 4752637a6ad4
files src/lib-index/mail-cache.c
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-cache.c	Tue Nov 06 20:55:36 2007 +0200
+++ b/src/lib-index/mail-cache.c	Tue Nov 06 21:26:02 2007 +0200
@@ -515,14 +515,15 @@
 		return 0;
 	}
 
-	if (cache->hdr->file_seq != reset_id) {
-		/* we want the latest cache file */
-		ret = mail_cache_reopen(cache);
-		if (ret < 0 || (ret == 0 && require_same_reset_id))
-			return ret;
-	}
+	for (i = 0; i < 3; i++) {
+		if (cache->hdr->file_seq != reset_id &&
+		    (require_same_reset_id || i == 0)) {
+			/* we want the latest cache file */
+			ret = mail_cache_reopen(cache);
+			if (ret <= 0)
+				break;
+		}
 
-	for (i = 0; i < 3; i++) {
 		ret = mail_cache_lock_file(cache);
 		if (ret <= 0)
 			break;
@@ -536,8 +537,6 @@
 
 		/* okay, so it was just compressed. try again. */
 		(void)mail_cache_unlock(cache);
-		if ((ret = mail_cache_reopen(cache)) <= 0)
-			break;
 		ret = 0;
 	}