From: Timo Sirainen <tss@iki.fi>
Date: Fri, 15 Oct 2010 23:43:49 +0000 (+0100)
Subject: lib-index: Work around clang static analyzer's false positive "dead code" issue.
X-Git-Tag: 2.0.6~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b99f3f908d51f4d1f7628bdf2cc6100cd8587656;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Work around clang static analyzer's false positive "dead code" issue.
---

diff --git a/src/lib-index/mail-index-sync-update.c b/src/lib-index/mail-index-sync-update.c
index 3702995582..30da5935ef 100644
--- a/src/lib-index/mail-index-sync-update.c
+++ b/src/lib-index/mail-index-sync-update.c
@@ -70,7 +70,7 @@ static void mail_index_sync_replace_map(struct mail_index_sync_map_ctx *ctx,
 	mail_index_modseq_sync_map_replaced(ctx->modseq_ctx);
 }
 
-static void
+static struct mail_index_map *
 mail_index_sync_move_to_private_memory(struct mail_index_sync_map_ctx *ctx)
 {
 	struct mail_index_map *map = ctx->view->map;
@@ -86,6 +86,7 @@ mail_index_sync_move_to_private_memory(struct mail_index_sync_map_ctx *ctx)
 	if (!MAIL_INDEX_MAP_IS_IN_MEMORY(ctx->view->map))
 		mail_index_map_move_to_memory(ctx->view->map);
 	mail_index_modseq_sync_map_replaced(ctx->modseq_ctx);
+	return map;
 }
 
 struct mail_index_map *
@@ -374,8 +375,7 @@ static int sync_append(const struct mail_index_record *rec,
 	/* move to memory. the mapping is written when unlocking so we don't
 	   waste time re-mmap()ing multiple times or waste space growing index
 	   file too large */
-	mail_index_sync_move_to_private_memory(ctx);
-	map = view->map;
+	map = mail_index_sync_move_to_private_memory(ctx);
 
 	if (rec->uid <= map->rec_map->last_appended_uid) {
 		i_assert(map->hdr.messages_count < map->rec_map->records_count);