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

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

Cleanup performed with the following semantic patch:

	@@
	expression E;
	@@

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

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index ef917823cc..43e3610ffd 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -251,8 +251,7 @@ void client_disconnect(struct client *client, const char *reason)
 		io_remove(&client->io);
 		if (client->ssl_iostream != NULL)
 			ssl_iostream_destroy(&client->ssl_iostream);
-		if (client->iostream_fd_proxy != NULL)
-			iostream_proxy_unref(&client->iostream_fd_proxy);
+		iostream_proxy_unref(&client->iostream_fd_proxy);
 		i_stream_close(client->input);
 		o_stream_close(client->output);
 		i_close_fd(&client->fd);
@@ -365,8 +364,7 @@ bool client_unref(struct client **_client)
 
 	if (client->ssl_iostream != NULL)
 		ssl_iostream_destroy(&client->ssl_iostream);
-	if (client->iostream_fd_proxy != NULL)
-		iostream_proxy_unref(&client->iostream_fd_proxy);
+	iostream_proxy_unref(&client->iostream_fd_proxy);
 	if (client->fd_proxying) {
 		DLLIST_REMOVE(&client_fd_proxies, client);
 		i_assert(client_fd_proxies_count > 0);
diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index e9cc0d1692..c32d387c87 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -386,8 +386,7 @@ static void login_proxy_disconnect(struct login_proxy *proxy)
 		proxy->state_rec->num_proxying_connections--;
 	}
 
-	if (proxy->iostream_proxy != NULL)
-		iostream_proxy_unref(&proxy->iostream_proxy);
+	iostream_proxy_unref(&proxy->iostream_proxy);
 	if (proxy->server_ssl_iostream != NULL)
 		ssl_iostream_destroy(&proxy->server_ssl_iostream);