From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Thu, 9 Nov 2017 15:37:34 +0000 (-0500)
Subject: global: start relying on ssl_iostream_destroy(NULL) being a no-op
X-Git-Tag: 2.3.1~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5ab340f182b6a64830f03fb849ca7cdc8c0404c;p=thirdparty%2Fdovecot%2Fcore.git

global: start relying on ssl_iostream_destroy(NULL) being a no-op

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

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

diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index 4c8eead869..25b59a7af9 100644
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -621,8 +621,7 @@ client_connection_tcp_free(struct client_connection *_conn)
 		doveadm_server_restore_logs();
 		o_stream_unref(&conn->log_out);
 	}
-	if (conn->ssl_iostream != NULL)
-		ssl_iostream_destroy(&conn->ssl_iostream);
+	ssl_iostream_destroy(&conn->ssl_iostream);
 
 	io_remove(&conn->io);
 	o_stream_destroy(&conn->output);
diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 3c36be4b1c..25dce789bf 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -719,8 +719,7 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
 	dsync_ibc_deinit(&ibc);
 	if (ibc2 != NULL)
 		dsync_ibc_deinit(&ibc2);
-	if (ctx->ssl_iostream != NULL)
-		ssl_iostream_destroy(&ctx->ssl_iostream);
+	ssl_iostream_destroy(&ctx->ssl_iostream);
 	if (ctx->ssl_ctx != NULL)
 		ssl_iostream_context_unref(&ctx->ssl_ctx);
 	if (ctx->input != NULL) {
diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index 4217217502..cca0e570a3 100644
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -1025,8 +1025,7 @@ smtp_server_connection_disconnect(struct smtp_server_connection *conn,
 		o_stream_uncork(conn->conn.output);
 	if (conn->smtp_parser != NULL)
 		smtp_command_parser_deinit(&conn->smtp_parser);
-	if (conn->ssl_iostream != NULL)
-		ssl_iostream_destroy(&conn->ssl_iostream);
+	ssl_iostream_destroy(&conn->ssl_iostream);
 
 	if (conn->callbacks != NULL &&
 		conn->callbacks->conn_disconnect != NULL) {
diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index 43e3610ffd..348db634cd 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -249,8 +249,7 @@ void client_disconnect(struct client *client, const char *reason)
 		o_stream_uncork(client->output);
 	if (!client->login_success) {
 		io_remove(&client->io);
-		if (client->ssl_iostream != NULL)
-			ssl_iostream_destroy(&client->ssl_iostream);
+		ssl_iostream_destroy(&client->ssl_iostream);
 		iostream_proxy_unref(&client->iostream_fd_proxy);
 		i_stream_close(client->input);
 		o_stream_close(client->output);
@@ -362,8 +361,7 @@ bool client_unref(struct client **_client)
 	if (client->v.free != NULL)
 		client->v.free(client);
 
-	if (client->ssl_iostream != NULL)
-		ssl_iostream_destroy(&client->ssl_iostream);
+	ssl_iostream_destroy(&client->ssl_iostream);
 	iostream_proxy_unref(&client->iostream_fd_proxy);
 	if (client->fd_proxying) {
 		DLLIST_REMOVE(&client_fd_proxies, client);
diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index c32d387c87..ead4c05444 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -387,8 +387,7 @@ static void login_proxy_disconnect(struct login_proxy *proxy)
 	}
 
 	iostream_proxy_unref(&proxy->iostream_proxy);
-	if (proxy->server_ssl_iostream != NULL)
-		ssl_iostream_destroy(&proxy->server_ssl_iostream);
+	ssl_iostream_destroy(&proxy->server_ssl_iostream);
 
 	io_remove(&proxy->server_io);
 	i_stream_destroy(&proxy->server_input);