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 fad7edb2f29093d0ea9810afcfdb170d46751e01..ec761b59a9ace2a779b0e9215d42eb474c48b629 100644 (file)
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -623,8 +623,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 f6a95400917e598a2207f58ded5c99d8d4f5175a..46b5255230fcfc8593a7451b05cfc391c52b1fc2 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -717,8 +717,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 daeba08ce6b9ff56514a16b81738442e908a5563..11f4c5faa8bd851549e3403516828c0e9d7f3776 100644 (file)
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -1027,8 +1027,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 eb5b20ef8cbbbcfd2275e048a1a340ea16f176ba..ba92802052421857203ba9d6bbc40d822cf5c64e 100644 (file)
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -250,8 +250,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);
@@ -363,8 +362,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 c32d387c8759f6305d091c705f0f5de4be1e283d..ead4c054448ad34942e29d4b59a29a530beeff2a 100644 (file)
--- 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);