From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 7 Oct 2017 14:57:45 +0000 (+0200)
Subject: doveadm-server: tcp: Moved client_connection_destroy().
X-Git-Tag: 2.3.0.rc1~755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd13c18ef29eb9793e04af44f039398359a548ba;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-server: tcp: Moved client_connection_destroy().
---

diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index 6f719bdb45..a36b71f740 100644
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -558,6 +558,39 @@ client_connection_send_auth_handshake(struct client_connection *
 	}
 }
 
+void client_connection_destroy(struct client_connection **_conn)
+{
+	struct client_connection *conn = *_conn;
+
+	*_conn = NULL;
+
+	doveadm_print_deinit();
+
+	if (conn->http)
+		client_connection_destroy_http(conn);
+
+	if (conn->ssl_iostream != NULL)
+		ssl_iostream_destroy(&conn->ssl_iostream);
+
+	o_stream_destroy(&conn->output);
+
+	io_remove(&conn->io);
+
+	if (conn->log_out != NULL) {
+		doveadm_server_restore_logs();
+		o_stream_unref(&conn->log_out);
+	}
+
+	i_stream_destroy(&conn->input);
+
+	i_close_fd(&conn->fd);
+	pool_unref(&conn->pool);
+
+	doveadm_print_ostream = NULL;
+
+	client_connection_deinit(conn);
+}
+
 struct client_connection *
 client_connection_create(int fd, int listen_fd, bool ssl)
 {
@@ -593,36 +626,3 @@ client_connection_create(int fd, int listen_fd, bool ssl)
 
 	return conn;
 }
-
-void client_connection_destroy(struct client_connection **_conn)
-{
-	struct client_connection *conn = *_conn;
-
-	*_conn = NULL;
-
-	doveadm_print_deinit();
-
-	if (conn->http)
-		client_connection_destroy_http(conn);
-
-	if (conn->ssl_iostream != NULL)
-		ssl_iostream_destroy(&conn->ssl_iostream);
-
-	o_stream_destroy(&conn->output);
-
-	io_remove(&conn->io);
-
-	if (conn->log_out != NULL) {
-		doveadm_server_restore_logs();
-		o_stream_unref(&conn->log_out);
-	}
-
-	i_stream_destroy(&conn->input);
-
-	i_close_fd(&conn->fd);
-	pool_unref(&conn->pool);
-
-	doveadm_print_ostream = NULL;
-
-	client_connection_deinit(conn);
-}