lib-http: Reformat http-client-connection.c.

diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index eabdd7927d57a196dcebe3f3aa361de30d31088c..64b31088dca8d9f0c408ae4d85402e55f3525e3f 100644 (file)
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -347,20 +347,22 @@ int http_client_connection_check_ready(struct http_client_connection *conn)
 
        if (conn->last_ioloop != NULL && conn->last_ioloop != current_ioloop) {
                conn->last_ioloop = current_ioloop;
-               /* Active ioloop is different from what we saw earlier;
-                  we may have missed a disconnection event on this connection.
-                  Verify status by reading from connection. */
+               /* Active ioloop is different from what we saw earlier; we may
+                  have missed a disconnection event on this connection. Verify
+                  status by reading from connection. */
                if (i_stream_read(conn->conn.input) == -1) {
                        int stream_errno = conn->conn.input->stream_errno;
 
                        i_assert(conn->conn.input->stream_errno != 0 ||
                                 conn->conn.input->eof);
-                       http_client_connection_lost(&conn,
-                               t_strdup_printf("read(%s) failed: %s",
-                                               i_stream_get_name(conn->conn.input),
-                                               stream_errno != 0 ?
-                                               i_stream_get_error(conn->conn.input) :
-                                               "EOF"));
+                       http_client_connection_lost(
+                               &conn,
+                               t_strdup_printf(
+                                       "read(%s) failed: %s",
+                                       i_stream_get_name(conn->conn.input),
+                                       (stream_errno != 0 ?
+                                        i_stream_get_error(conn->conn.input) :
+                                        "EOF")));
                        return -1;
                }
 
@@ -744,7 +746,7 @@ static void http_client_connection_destroy(struct connection *_conn)
        case CONNECTION_DISCONNECT_CONN_CLOSED:
                if (conn->connect_failed) {
                        i_assert(!array_is_created(&conn->request_wait_list) ||
-                               array_count(&conn->request_wait_list) == 0);
+                                array_count(&conn->request_wait_list) == 0);
                        break;
                }
                http_client_connection_lost(
@@ -910,8 +912,9 @@ http_client_connection_return_response(struct http_client_connection *conn,
        if (retrying) {
                /* Retrying, don't destroy the request */
                if (response->payload != NULL) {
-                       i_stream_remove_destroy_callback(conn->incoming_payload,
-                                                        http_client_payload_destroyed);
+                       i_stream_remove_destroy_callback(
+                               conn->incoming_payload,
+                               http_client_payload_destroyed);
                        i_stream_unref(&conn->incoming_payload);
                        connection_input_resume(&conn->conn);
                }
@@ -958,7 +961,8 @@ http_client_request_add_event_headers(struct http_client_request *req,
        string_t *str = t_str_new(128);
        for (unsigned int i = 0; req->event_headers[i] != NULL; i++) {
                const char *hdr_name = req->event_headers[i];
-               const char *value = http_response_header_get(response, hdr_name);
+               const char *value =
+                       http_response_header_get(response, hdr_name);
 
                if (value == NULL)
                        continue;
@@ -992,7 +996,7 @@ static void http_client_connection_input(struct connection *_conn)
        _conn->last_input = ioloop_time;
 
        if (conn->ssl_iostream != NULL &&
-               !ssl_iostream_is_handshaked(conn->ssl_iostream)) {
+           !ssl_iostream_is_handshaked(conn->ssl_iostream)) {
                /* Finish SSL negotiation by reading from input stream */
                while ((ret = i_stream_read(conn->conn.input)) > 0 ||
                       ret == -2) {
@@ -1089,7 +1093,8 @@ static void http_client_connection_input(struct connection *_conn)
                        http_response_parser_get_last_offset(conn->http_parser);
                i_assert(req->response_offset != UOFF_T_MAX);
                i_assert(req->response_offset < conn->conn.input->v_offset);
-               req->bytes_in = conn->conn.input->v_offset - req->response_offset;
+               req->bytes_in = conn->conn.input->v_offset -
+                       req->response_offset;
 
                /* Got some response; cancel response timeout */
                timeout_remove(&conn->to_response);
@@ -1276,6 +1281,7 @@ static void http_client_connection_input(struct connection *_conn)
        if (ret <= 0 &&
            (conn->conn.input->eof || conn->conn.input->stream_errno != 0)) {
                int stream_errno = conn->conn.input->stream_errno;
+
                http_client_connection_lost(
                        &conn,
                        t_strdup_printf("read(%s) failed: %s",
@@ -1456,7 +1462,7 @@ static void http_client_connection_ready(struct http_client_connection *conn)
 
        /* Start protocol I/O */
        conn->http_parser = http_response_parser_init(
-               conn->conn.input,  &set->response_hdr_limits, 0);
+               conn->conn.input, &set->response_hdr_limits, 0);
        o_stream_set_finish_via_child(conn->conn.output, FALSE);
        o_stream_set_flush_callback(conn->conn.output,
                                    http_client_connection_output, conn);
@@ -1499,9 +1505,8 @@ http_client_connection_ssl_init(struct http_client_connection *conn,
        i_assert(ssl_ctx != NULL);
 
        ssl_set = *set->ssl;
-       if (!set->ssl->allow_invalid_cert) {
+       if (!set->ssl->allow_invalid_cert)
                ssl_set.verbose_invalid_cert = TRUE;
-       }
 
        e_debug(conn->event, "Starting SSL handshake");