From cff2942962a11f78d23bcb0a4ed56f67e751819c Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Thu, 9 Nov 2017 10:34:21 -0500 Subject: [PATCH] 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); --- src/login-common/client-common.c | 6 ++---- src/login-common/login-proxy.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c index cac6c316ff..eb5b20ef8c 100644 --- a/src/login-common/client-common.c +++ b/src/login-common/client-common.c @@ -252,8 +252,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); @@ -366,8 +365,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); -- 2.47.3