From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 7 Jun 2017 10:34:39 +0000 (+0300)
Subject: lib-mail: message_address_parse() - Remove unnecessary NULL checks
X-Git-Tag: 2.2.31.rc1~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a646e69cac3949281b628dbebf2f21e56b58d28d;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message_address_parse() - Remove unnecessary NULL checks

message_address_parse() always initialized rfc822_parser_init() with
last_comment string.
---

diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
index ccb1392a7a..0db091d90b 100644
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -204,8 +204,7 @@ static int parse_addr_spec(struct message_address_parser_context *ctx)
 	/* addr-spec       = local-part "@" domain */
 	int ret, ret2;
 
-	if (ctx->parser.last_comment != NULL)
-		str_truncate(ctx->parser.last_comment, 0);
+	str_truncate(ctx->parser.last_comment, 0);
 
 	ret = parse_local_part(ctx);
 	if (ret <= 0) {
@@ -218,12 +217,8 @@ static int parse_addr_spec(struct message_address_parser_context *ctx)
 			ret = ret2;
 	}
 
-	if (ctx->parser.last_comment != NULL) {
-		if (str_len(ctx->parser.last_comment) > 0) {
-			ctx->addr.name =
-				p_strdup(ctx->pool, str_c(ctx->parser.last_comment));
-		}
-	}
+	if (str_len(ctx->parser.last_comment) > 0)
+		ctx->addr.name = p_strdup(ctx->pool, str_c(ctx->parser.last_comment));
 	return ret;
 }