From: sergey.kitov Date: Thu, 30 Dec 2021 18:57:21 +0000 (+0200) Subject: lib-http: Whitespace cleanup. X-Git-Tag: 2.4.0~4670 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2beb42110abd0e96ba07f528a5cabdfb900832d;p=thirdparty%2Fdovecot%2Fcore.git lib-http: Whitespace cleanup. --- diff --git a/src/lib-http/http-header-parser.c b/src/lib-http/http-header-parser.c index 29de688e8d..ddb0631870 100644 --- a/src/lib-http/http-header-parser.c +++ b/src/lib-http/http-header-parser.c @@ -263,7 +263,7 @@ static int http_header_parse(struct http_header_parser *parser) buffer_append_c(parser->value_buf, ' '); parser->state = HTTP_HEADER_PARSE_STATE_OWS; break; - } + } /* next header line */ parser->state = HTTP_HEADER_PARSE_STATE_INIT; return 1; @@ -336,7 +336,7 @@ int http_header_parse_next_field(struct http_header_parser *parser, if (parser->state != HTTP_HEADER_PARSE_STATE_EOH) { data = buffer_get_data(parser->value_buf, &size); - + /* trim trailing OWS */ while (size > 0 && (data[size-1] == ' ' || data[size-1] == '\t')) diff --git a/src/lib-http/http-request-parser.c b/src/lib-http/http-request-parser.c index 8cb44bad94..5314e26566 100644 --- a/src/lib-http/http-request-parser.c +++ b/src/lib-http/http-request-parser.c @@ -25,7 +25,7 @@ enum http_request_parser_state { struct http_request_parser { struct http_message_parser parser; pool_t pool; - + enum http_request_parser_state state; struct http_url *default_base_url; @@ -286,9 +286,9 @@ static int http_request_parse(struct http_request_parser *parser, } parser->state = HTTP_REQUEST_PARSE_STATE_INIT; break; - case HTTP_REQUEST_PARSE_STATE_HEADER: - default: - i_unreached(); + case HTTP_REQUEST_PARSE_STATE_HEADER: + default: + i_unreached(); } } @@ -398,7 +398,7 @@ http_request_parse_expect_header(struct http_request_parser *parser, http_parse_ows(&hparser); if (hparser.cur >= hparser.end) break; - + if (*hparser.cur == '=') { hparser.cur++; http_parse_ows(&hparser); @@ -408,7 +408,7 @@ http_request_parse_expect_header(struct http_request_parser *parser, parse_error = TRUE; break; } - + if (parser->error_code == HTTP_REQUEST_PARSE_ERROR_NONE) { parser->error_code = HTTP_REQUEST_PARSE_ERROR_EXPECTATION_FAILED; _parser->error = t_strdup_printf @@ -456,7 +456,7 @@ http_request_parse_expect_header(struct http_request_parser *parser, } } if (parse_error) - break; + break; } http_parse_ows(&hparser); if (hparser.cur >= hparser.end || *hparser.cur != ',') @@ -488,7 +488,7 @@ http_request_parse_headers(struct http_request_parser *parser, { const ARRAY_TYPE(http_header_field) *hdrs; const struct http_header_field *hdr; - + hdrs = http_header_get_fields(parser->parser.msg.header); array_foreach(hdrs, hdr) { int ret = 0; @@ -538,7 +538,7 @@ int http_request_parse_next(struct http_request_parser *parser, return ret; /* RFC 7230, Section 3: - + HTTP-message = start-line *( header-field CRLF ) CRLF @@ -549,7 +549,7 @@ int http_request_parse_next(struct http_request_parser *parser, /* assign early for error reporting */ request->method = parser->request_method; - request->target_raw = parser->request_target; + request->target_raw = parser->request_target; request->version_major = parser->parser.msg.version_major; request->version_minor = parser->parser.msg.version_minor; diff --git a/src/lib-http/http-response-parser.c b/src/lib-http/http-response-parser.c index e381403337..7863b19973 100644 --- a/src/lib-http/http-response-parser.c +++ b/src/lib-http/http-response-parser.c @@ -332,7 +332,7 @@ int http_response_parse_next(struct http_response_parser *parser, http_response_parser_restart(parser); /* RFC 7230, Section 3: - + HTTP-message = start-line *( header-field CRLF ) CRLF @@ -343,7 +343,7 @@ int http_response_parse_next(struct http_response_parser *parser, *error_r = parser->parser.error; return ret; } - } + } if ((ret = http_message_parse_headers(&parser->parser)) <= 0) { *error_r = parser->parser.error; return ret; @@ -382,12 +382,12 @@ int http_response_parse_next(struct http_response_parser *parser, /* [ message-body ] */ if (http_message_parse_body(&parser->parser, FALSE) < 0) { *error_r = parser->parser.error; - return -1; + return -1; } } /* RFC 7231, Section 7.1.3: Retry-After - + Servers send the "Retry-After" header field to indicate how long the user agent ought to wait before making a follow-up request. When sent with a 503 (Service Unavailable) response, Retry-After indicates @@ -396,7 +396,7 @@ int http_response_parse_next(struct http_response_parser *parser, the minimum time that the user agent is asked to wait before issuing the redirected request. */ - if (parser->response_status == 503 || (parser->response_status / 100) == 3) { + if (parser->response_status == 503 || (parser->response_status / 100) == 3) { hdrval = http_header_field_get(parser->parser.msg.header, "Retry-After"); if (hdrval != NULL) { (void)http_response_parse_retry_after diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c index 0e9099204e..5ef70554e6 100644 --- a/src/lib-http/http-transfer-chunked.c +++ b/src/lib-http/http-transfer-chunked.c @@ -494,7 +494,7 @@ http_transfer_chunked_istream_read(struct istream_private *stream) case HTTP_CHUNKED_PARSE_STATE_FINISHED: tcstream->istream.istream.eof = TRUE; return -1; - case HTTP_CHUNKED_PARSE_STATE_DATA: + case HTTP_CHUNKED_PARSE_STATE_DATA: ret = http_transfer_chunked_istream_read_data(tcstream); if (ret != 0) return ret;