master: Reformat test-master-login-auth.c.

diff --git a/src/master/test-master-login-auth.c b/src/master/test-master-login-auth.c
index 40775b2ccfe3317f8f93e5924d87ad917a851064..6a1ee09cd9c3435a9230917afec55beec689b09e 100644 (file)
--- a/src/master/test-master-login-auth.c
+++ b/src/master/test-master-login-auth.c
@@ -92,16 +92,14 @@ test_run_client_server(test_client_init_t *client_test,
 
 /* server */
 
-static void
-test_server_connection_refused(void)
+static void test_server_connection_refused(void)
 {
        i_close_fd(&fd_listen);
 }
 
 /* client */
 
-static bool
-test_client_connection_refused(void)
+static bool test_client_connection_refused(void)
 {
        const char *error;
        int ret;
@@ -131,8 +129,7 @@ static void test_connection_refused(void)
 
 /* server */
 
-static void
-test_connection_timed_out_input(struct server_connection *conn)
+static void test_connection_timed_out_input(struct server_connection *conn)
 {
        sleep(5);
        server_connection_deinit(&conn);
@@ -146,8 +143,7 @@ static void test_server_connection_timed_out(void)
 
 /* client */
 
-static bool
-test_client_connection_timed_out(void)
+static bool test_client_connection_timed_out(void)
 {
        time_t time;
        const char *error;
@@ -183,19 +179,15 @@ static void test_connection_timed_out(void)
 
 /* server */
 
-static void
-test_bad_version_input(struct server_connection *conn)
+static void test_bad_version_input(struct server_connection *conn)
 {
        server_connection_deinit(&conn);
 }
 
-static void
-test_bad_version_init(struct server_connection *conn)
+static void test_bad_version_init(struct server_connection *conn)
 {
-       o_stream_nsend_str(conn->conn.output,
-               "VERSION\t666\t666\n");
-       o_stream_nsend_str(conn->conn.output,
-               "SPID\t23234\n");
+       o_stream_nsend_str(conn->conn.output, "VERSION\t666\t666\n");
+       o_stream_nsend_str(conn->conn.output, "SPID\t23234\n");
 }
 
 static void test_server_bad_version(void)
@@ -207,8 +199,7 @@ static void test_server_bad_version(void)
 
 /* client */
 
-static bool
-test_client_bad_version(void)
+static bool test_client_bad_version(void)
 {
        const char *error;
        int ret;
@@ -238,8 +229,7 @@ static void test_bad_version(void)
 
 /* server */
 
-static void
-test_disconnect_version_input(struct server_connection *conn)
+static void test_disconnect_version_input(struct server_connection *conn)
 {
        const char *line;
 
@@ -252,13 +242,10 @@ test_disconnect_version_input(struct server_connection *conn)
        server_connection_deinit(&conn);
 }
 
-static void
-test_disconnect_version_init(struct server_connection *conn)
+static void test_disconnect_version_init(struct server_connection *conn)
 {
-       o_stream_nsend_str(conn->conn.output,
-               "VERSION\t1\t0\n");
-       o_stream_nsend_str(conn->conn.output,
-               "SPID\t23234\n");
+       o_stream_nsend_str(conn->conn.output, "VERSION\t1\t0\n");
+       o_stream_nsend_str(conn->conn.output, "SPID\t23234\n");
 }
 
 static void test_server_disconnect_version(void)
@@ -270,8 +257,7 @@ static void test_server_disconnect_version(void)
 
 /* client */
 
-static bool
-test_client_disconnect_version(void)
+static bool test_client_disconnect_version(void)
 {
        const char *error;
        int ret;
@@ -301,8 +287,7 @@ static void test_disconnect_version(void)
 
 /* server */
 
-static void
-test_changed_spid_input(struct server_connection *conn)
+static void test_changed_spid_input(struct server_connection *conn)
 {
        const char *line;
 
@@ -315,13 +300,10 @@ test_changed_spid_input(struct server_connection *conn)
        server_connection_deinit(&conn);
 }
 
-static void
-test_changed_spid_init(struct server_connection *conn)
+static void test_changed_spid_init(struct server_connection *conn)
 {
-       o_stream_nsend_str(conn->conn.output,
-               "VERSION\t1\t0\n");
-       o_stream_nsend_str(conn->conn.output,
-               "SPID\t35341\n");
+       o_stream_nsend_str(conn->conn.output, "VERSION\t1\t0\n");
+       o_stream_nsend_str(conn->conn.output, "SPID\t35341\n");
 }
 
 static void test_server_changed_spid(void)
@@ -333,8 +315,7 @@ static void test_server_changed_spid(void)
 
 /* client */
 
-static bool
-test_client_changed_spid(void)
+static bool test_client_changed_spid(void)
 {
        const char *error;
        int ret;
@@ -375,8 +356,7 @@ struct _request_fail_server {
        bool not_found:1;
 };
 
-static void
-test_request_fail_input(struct server_connection *conn)
+static void test_request_fail_input(struct server_connection *conn)
 {
        struct _request_fail_server *ctx =
                (struct _request_fail_server *)conn->context;
@@ -422,7 +402,8 @@ test_request_fail_input(struct server_connection *conn)
                                server_connection_deinit(&conn);
                                return;
                        } else {
-                               line = t_strdup_printf("FAIL\t%u\t"
+                               line = t_strdup_printf(
+                                       "FAIL\t%u\t"
                                        "reason=REQUEST DENIED\n", id);
                        }
                        o_stream_nsend_str(conn->conn.output, line);
@@ -433,18 +414,15 @@ test_request_fail_input(struct server_connection *conn)
        }
 }
 
-static void
-test_request_fail_init(struct server_connection *conn)
+static void test_request_fail_init(struct server_connection *conn)
 {
        struct _request_fail_server *ctx;
 
        ctx = p_new(conn->pool, struct _request_fail_server, 1);
        conn->context = (void*)ctx;
 
-       o_stream_nsend_str(conn->conn.output,
-               "VERSION\t1\t0\n");
-       o_stream_nsend_str(conn->conn.output,
-               "SPID\t23234\n");
+       o_stream_nsend_str(conn->conn.output, "VERSION\t1\t0\n");
+       o_stream_nsend_str(conn->conn.output, "SPID\t23234\n");
 }
 
 static void test_server_request_fail(void)
@@ -456,8 +434,7 @@ static void test_server_request_fail(void)
 
 /* client */
 
-static bool
-test_client_request_fail(void)
+static bool test_client_request_fail(void)
 {
        const char *error;
        int ret;
@@ -470,8 +447,7 @@ test_client_request_fail(void)
        return FALSE;
 }
 
-static bool
-test_client_request_notfound(void)
+static bool test_client_request_notfound(void)
 {
        const char *error;
        int ret;
@@ -484,8 +460,7 @@ test_client_request_notfound(void)
        return FALSE;
 }
 
-static bool
-test_client_request_timeout(void)
+static bool test_client_request_timeout(void)
 {
        const char *error;
        int ret;
@@ -498,8 +473,7 @@ test_client_request_timeout(void)
        return FALSE;
 }
 
-static bool
-test_client_request_disconnect(void)
+static bool test_client_request_disconnect(void)
 {
        const char *error;
        int ret;
@@ -512,8 +486,7 @@ test_client_request_disconnect(void)
        return FALSE;
 }
 
-static bool
-test_client_request_reconnect(void)
+static bool test_client_request_reconnect(void)
 {
        const char *error;
        int ret;
@@ -576,8 +549,7 @@ struct _request_login_server {
        enum _request_login_state state;
 };
 
-static void
-test_request_login_input(struct server_connection *conn)
+static void test_request_login_input(struct server_connection *conn)
 {
        struct _request_login_server *ctx =
                (struct _request_login_server *)conn->context;
@@ -620,18 +592,15 @@ test_request_login_input(struct server_connection *conn)
        }
 }
 
-static void
-test_request_login_init(struct server_connection *conn)
+static void test_request_login_init(struct server_connection *conn)
 {
        struct _request_login_server *ctx;
 
        ctx = p_new(conn->pool, struct _request_login_server, 1);
        conn->context = (void*)ctx;
 
-       o_stream_nsend_str(conn->conn.output,
-               "VERSION\t1\t0\n");
-       o_stream_nsend_str(conn->conn.output,
-               "SPID\t23234\n");
+       o_stream_nsend_str(conn->conn.output, "VERSION\t1\t0\n");
+       o_stream_nsend_str(conn->conn.output, "SPID\t23234\n");
 }
 
 static void test_server_request_login(void)
@@ -643,8 +612,7 @@ static void test_server_request_login(void)
 
 /* client */
 
-static bool
-test_client_request_login(void)
+static bool test_client_request_login(void)
 {
        const char *error;
        int ret;
@@ -655,8 +623,7 @@ test_client_request_login(void)
        return FALSE;
 }
 
-static bool
-test_client_request_login_parallel(void)
+static bool test_client_request_login_parallel(void)
 {
        const char *error;
        int ret;
@@ -809,16 +776,14 @@ test_client_request_simple(pid_t client_pid, bool retry, const char **error_r)
 
 /* client connection */
 
-static void
-server_connection_input(struct connection *_conn)
+static void server_connection_input(struct connection *_conn)
 {
        struct server_connection *conn = (struct server_connection *)_conn;
 
        test_server_input(conn);
 }
 
-static void
-server_connection_init(int fd)
+static void server_connection_init(int fd)
 {
        struct server_connection *conn;
        pool_t pool;
@@ -829,15 +794,14 @@ server_connection_init(int fd)
        conn = p_new(pool, struct server_connection, 1);
        conn->pool = pool;
 
-       connection_init_server
-               (server_conn_list, &conn->conn, "server connection", fd, fd);
+       connection_init_server(server_conn_list, &conn->conn,
+                              "server connection", fd, fd);
 
        if (test_server_init != NULL)
                test_server_init(conn);
 }
 
-static void
-server_connection_deinit(struct server_connection **_conn)
+static void server_connection_deinit(struct server_connection **_conn)
 {
        struct server_connection *conn = *_conn;
 
@@ -850,8 +814,7 @@ server_connection_deinit(struct server_connection **_conn)
        pool_unref(&conn->pool);
 }
 
-static void
-server_connection_destroy(struct connection *_conn)
+static void server_connection_destroy(struct connection *_conn)
 {
        struct server_connection *conn =
                (struct server_connection *)_conn;
@@ -859,8 +822,7 @@ server_connection_destroy(struct connection *_conn)
        server_connection_deinit(&conn);
 }
 
-static void
-server_connection_accept(void *context ATTR_UNUSED)
+static void server_connection_accept(void *context ATTR_UNUSED)
 {
        int fd;
 
@@ -992,8 +954,7 @@ test_run_client_server(test_client_init_t *client_test,
 
 volatile sig_atomic_t terminating = 0;
 
-static void
-test_signal_handler(int signo)
+static void test_signal_handler(int signo)
 {
        if (terminating != 0)
                raise(signo);