From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Mon, 29 Jan 2018 13:38:45 +0000 (-0500)
Subject: lib-mail: start relying on mail_html2text_deinit(NULL) being a no-op
X-Git-Tag: 2.3.1~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27aed64c71c1fd94ef5ff9f0654698f84839af67;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: start relying on mail_html2text_deinit(NULL) being a no-op

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

	- if (E != NULL) {
	-       mail_html2text_deinit(&E);
	- }
	+ mail_html2text_deinit(&E);
---

diff --git a/src/lib-mail/message-snippet.c b/src/lib-mail/message-snippet.c
index 8632b33dc5..b42800a252 100644
--- a/src/lib-mail/message-snippet.c
+++ b/src/lib-mail/message-snippet.c
@@ -138,8 +138,7 @@ int message_snippet_generate(struct istream *input,
 	i_assert(ret != 0);
 	message_decoder_deinit(&decoder);
 	message_parser_deinit(&parser, &parts);
-	if (ctx.html2text != NULL)
-		mail_html2text_deinit(&ctx.html2text);
+	mail_html2text_deinit(&ctx.html2text);
 	pool_unref(&pool);
 	return input->stream_errno == 0 ? 0 : -1;
 }