From: Timo Sirainen <tss@iki.fi>
Date: Sun, 12 Feb 2012 05:12:41 +0000 (+0200)
Subject: Make static analyzer happier.
X-Git-Tag: 2.1.rc6~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa7c8cccdbe3b22d48b6b71bba724d30a205ea8;p=thirdparty%2Fdovecot%2Fcore.git

Make static analyzer happier.
---

diff --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c
index a5ddfb2fa5..7c18c18360 100644
--- a/src/lib-storage/index/index-thread-finish.c
+++ b/src/lib-storage/index/index-thread-finish.c
@@ -650,11 +650,9 @@ mail_thread_iterate_next(struct mail_thread_iterate_context *iter,
 		return NULL;
 
 	child = &children[iter->next_idx++];
-	if (child_iter_r != NULL) {
-		shadow = array_idx(&iter->ctx->shadow_nodes, child->idx);
-		*child_iter_r = shadow->first_child_idx == 0 ? NULL :
-			mail_thread_iterate_children(iter, child->idx);
-	}
+	shadow = array_idx(&iter->ctx->shadow_nodes, child->idx);
+	*child_iter_r = shadow->first_child_idx == 0 ? NULL :
+		mail_thread_iterate_children(iter, child->idx);
 	if (child->uid == 0 && *child_iter_r == NULL) {
 		/* this is a dummy node without children,
 		   there's no point in returning it */