dovecot-2.2: lib-index: Small code cleanup

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/4e3a518f6fcd
changeset: 17288:4e3a518f6fcd
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 29 13:10:28 2014 +0300
description:
lib-index: Small code cleanup

diffstat:

 src/lib-index/mail-index-sync-update.c |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 66620a924bfa -r 4e3a518f6fcd src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c	Tue Apr 29 12:35:05 2014 +0300
+++ b/src/lib-index/mail-index-sync-update.c	Tue Apr 29 13:10:28 2014 +0300
@@ -165,14 +165,11 @@
 static void
 mail_index_sync_header_update_counts(struct mail_index_sync_map_ctx *ctx,
 				     uint32_t uid, uint8_t old_flags,
-				     uint8_t new_flags, bool all)
+				     uint8_t new_flags)
 {
 	const char *error;
 
-	if (all) {
-		mail_index_sync_header_update_counts_all(ctx, uid, old_flags,
-							 new_flags);
-	} else if (uid >= ctx->view->map->hdr.next_uid) {
+	if (uid >= ctx->view->map->hdr.next_uid) {
 		mail_index_sync_set_corrupted(ctx, "uid %u >= next_uid %u",
 					      uid, ctx->view->map->hdr.next_uid);
 	} else {
@@ -250,8 +247,7 @@
 	map = mail_index_sync_get_atomic_map(ctx);
 	for (seq = seq1; seq <= seq2; seq++) {
 		rec = MAIL_INDEX_MAP_IDX(map, seq-1);
-		mail_index_sync_header_update_counts(ctx, rec->uid, rec->flags,
-						     0, FALSE);
+		mail_index_sync_header_update_counts(ctx, rec->uid, rec->flags, 0);
 	}
 
 	/* @UNSAFE */
@@ -393,8 +389,7 @@
 		map->hdr.flags |= MAIL_INDEX_HDR_FLAG_HAVE_DIRTY;
 
 	mail_index_header_update_lowwaters(ctx, rec->uid, new_flags);
-	mail_index_sync_header_update_counts(ctx, rec->uid,
-					     0, new_flags, FALSE);
+	mail_index_sync_header_update_counts(ctx, rec->uid, 0, new_flags);
 	return 1;
 }
 
@@ -436,9 +431,9 @@
 
 			mail_index_header_update_lowwaters(ctx, rec->uid,
 							   rec->flags);
-			mail_index_sync_header_update_counts(ctx, rec->uid,
-							     old_flags,
-							     rec->flags, TRUE);
+			mail_index_sync_header_update_counts_all(ctx, rec->uid,
+								 old_flags,
+								 rec->flags);
 		}
 	}
 	return 1;