dovecot: Code cleanup
dovecot at dovecot.org
dovecot at dovecot.org
Tue Nov 6 21:56:12 EET 2007
details: http://hg.dovecot.org/dovecot/rev/4f999ac56a53
changeset: 6706:4f999ac56a53
user: Timo Sirainen <tss at iki.fi>
date: Tue Nov 06 21:26:02 2007 +0200
description:
Code cleanup
diffstat:
1 file changed, 8 insertions(+), 9 deletions(-)
src/lib-index/mail-cache.c | 17 ++++++++---------
diffs (35 lines):
diff -r 68bb5bec043e -r 4f999ac56a53 src/lib-index/mail-cache.c
--- 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 @@ int mail_cache_lock(struct mail_cache *c
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;
+ }
+
ret = mail_cache_lock_file(cache);
if (ret <= 0)
break;
@@ -536,8 +537,6 @@ int mail_cache_lock(struct mail_cache *c
/* okay, so it was just compressed. try again. */
(void)mail_cache_unlock(cache);
- if ((ret = mail_cache_reopen(cache)) <= 0)
- break;
ret = 0;
}
More information about the dovecot-cvs
mailing list