lib-doveadm: doveadm_client_create() - Extract connection_client_connect() to own...

diff --git a/src/lib-doveadm/doveadm-client.c b/src/lib-doveadm/doveadm-client.c
index 55af6ff240abe555226f3382daaea77cb807a888..007d4cda8e2e1d770ec9fd22319ff659255ee91e 100644 (file)
--- a/src/lib-doveadm/doveadm-client.c
+++ b/src/lib-doveadm/doveadm-client.c
@@ -650,6 +650,17 @@ static void doveadm_client_connect_init(struct doveadm_client *conn)
                                  conn->set.port);
 }
 
+static int doveadm_client_connect(struct doveadm_client *conn,
+                                  const char **error_r)
+{
+       if (connection_client_connect(&conn->conn) < 0) {
+               *error_r = t_strdup_printf("net_connect(%s) failed: %m",
+                                          conn->conn.name);
+               return -1;
+       }
+       return 0;
+}
+
 static int
 doveadm_client_resolve_hostname(struct doveadm_client *conn,
                                const char **error_r)
@@ -709,9 +720,7 @@ int doveadm_client_create(const struct doveadm_client_settings *set,
                return -1;
        }
 
-       if (connection_client_connect(&conn->conn) < 0) {
-               *error_r = t_strdup_printf(
-                       "net_connect(%s) failed: %m", conn->conn.name);
+       if (doveadm_client_connect(conn, error_r) < 0) {
                connection_deinit(&conn->conn);
                pool_unref(&pool);
                return -1;