global: Replace ssl_iostream_unref() with ssl_iostream_destroy()

Destroying performs cleanups correctly.

diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 269985d629275a6970facddeb27a887b7f9671e4..e5b9930f538c1e96fc9676e0cfe0bfd9051bdf62 100644 (file)
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -603,8 +603,7 @@ void server_connection_destroy(struct server_connection **_conn)
        i_stream_destroy(&conn->cmd_input);
        /* close cmd_output after its parent, so the "." isn't sent */
        o_stream_destroy(&conn->cmd_output);
-       if (conn->ssl_iostream != NULL)
-               ssl_iostream_unref(&conn->ssl_iostream);
+       ssl_iostream_destroy(&conn->ssl_iostream);
        io_remove(&conn->io_log);
        /* make sure all logs got consumed */
        if (conn->log_input != NULL)

diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index 722c91fbf668afe9efae820195b98cca687bea25..a694bbc40ae9868f2dd4f98b1e0f76c61da77d6e 100644 (file)
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -1797,8 +1797,7 @@ bool http_client_connection_unref(struct http_client_connection **_conn)
        if (array_is_created(&conn->request_wait_list))
                array_free(&conn->request_wait_list);
 
-       if (conn->ssl_iostream != NULL)
-               ssl_iostream_unref(&conn->ssl_iostream);
+       ssl_iostream_destroy(&conn->ssl_iostream);
        if (conn->connect_initialized)
                connection_deinit(&conn->conn);
        io_wait_timer_remove(&conn->io_wait_timer);

diff --git a/src/lib-http/http-server-connection.c b/src/lib-http/http-server-connection.c
index c84ca70989a51ce0d7a6cb61785d33759e85dfa4..f59d4bc872a89b85193cf2f4dd44a237624f4276 100644 (file)
--- a/src/lib-http/http-server-connection.c
+++ b/src/lib-http/http-server-connection.c
@@ -1172,8 +1172,7 @@ bool http_server_connection_unref(struct http_server_connection **_conn)
 
        http_server_connection_debug(conn, "Connection destroy");
 
-       if (conn->ssl_iostream != NULL)
-               ssl_iostream_unref(&conn->ssl_iostream);
+       ssl_iostream_destroy(&conn->ssl_iostream);
        connection_deinit(&conn->conn);
 
        if (conn->callbacks != NULL &&

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 264a05a0cccc0185225e891aa855a8957428e015..c9e2b97f864c2f309eface0d04d38fa0eb2c65fc 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -461,8 +461,7 @@ void imapc_connection_disconnect_full(struct imapc_connection *conn,
        if (conn->parser != NULL)
                imap_parser_unref(&conn->parser);
        io_remove(&conn->io);
-       if (conn->ssl_iostream != NULL)
-               ssl_iostream_unref(&conn->ssl_iostream);
+       ssl_iostream_destroy(&conn->ssl_iostream);
        if (conn->fd != -1) {
                i_stream_destroy(&conn->input);
                o_stream_destroy(&conn->output);

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index 811dde546b70aa576e48a4c40d37d67cbcf68366..c5ceabe8ce34b8b13a0c06a6f9100f8626257003 100644 (file)
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1592,8 +1592,7 @@ void smtp_client_connection_disconnect(struct smtp_client_connection *conn)
        timeout_remove(&conn->to_trans);
        timeout_remove(&conn->to_commands);
 
-       if (conn->ssl_iostream != NULL)
-               ssl_iostream_unref(&conn->ssl_iostream);
+       ssl_iostream_destroy(&conn->ssl_iostream);
        if (conn->ssl_ctx != NULL)
                ssl_iostream_context_unref(&conn->ssl_ctx);
        if (conn->sasl_client != NULL)

diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index e34efc3af09b63a8d7f8e5a3e41d821238d3b119..ed5baa1e76e2e46a8b24cac8dbaaadcc654a39fa 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -204,8 +204,7 @@ static void pop3c_client_disconnect(struct pop3c_client *client)
        io_remove(&client->io);
        i_stream_destroy(&client->input);
        o_stream_destroy(&client->output);
-       if (client->ssl_iostream != NULL)
-               ssl_iostream_unref(&client->ssl_iostream);
+       ssl_iostream_destroy(&client->ssl_iostream);
        i_close_fd(&client->fd);
        while (array_count(&client->commands) > 0)
                pop3c_client_async_callback_disconnected(client);