From: Stephan Bosch Date: Mon, 27 Mar 2017 18:44:37 +0000 (+0200) Subject: lib-http: server: Changed http_server_request_is_complete() from an inline to a norma... X-Git-Tag: 2.3.0.rc1~1318 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ec9b6f85c8fbe67bfac523a5e3d33d34f72dddc;p=thirdparty%2Fdovecot%2Fcore.git lib-http: server: Changed http_server_request_is_complete() from an inline to a normal function. --- diff --git a/src/lib-http/http-server-private.h b/src/lib-http/http-server-private.h index 982cdd88b6..35db58fafe 100644 --- a/src/lib-http/http-server-private.h +++ b/src/lib-http/http-server-private.h @@ -155,13 +155,6 @@ struct http_server { bool shutting_down:1; /* shutting down server */ }; -/* - * Forward declarations - */ - -bool http_server_connection_pending_payload( - struct http_server_connection *conn); - /* * Response */ @@ -195,14 +188,6 @@ http_server_request_is_new(struct http_server_request *req) return (req->state == HTTP_SERVER_REQUEST_STATE_NEW); } -static inline bool -http_server_request_is_complete(struct http_server_request *req) -{ - return (req->failed || req->conn->input_broken || - (req->next != NULL && !http_server_request_is_new(req->next)) || - !http_server_connection_pending_payload(req->conn)); -} - static inline bool http_server_request_version_equals(struct http_server_request *req, unsigned int major, unsigned int minor) { @@ -215,6 +200,8 @@ void http_server_request_destroy(struct http_server_request **_req); void http_server_request_abort(struct http_server_request **_req, const char *reason) ATTR_NULL(2); +bool http_server_request_is_complete(struct http_server_request *req); + void http_server_request_halt_payload(struct http_server_request *req); void http_server_request_continue_payload(struct http_server_request *req); diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c index 96a24e9f04..8c8196f53e 100644 --- a/src/lib-http/http-server-request.c +++ b/src/lib-http/http-server-request.c @@ -210,6 +210,13 @@ bool http_server_request_is_finished(struct http_server_request *req) req->state == HTTP_SERVER_REQUEST_STATE_ABORTED; } +bool http_server_request_is_complete(struct http_server_request *req) +{ + return (req->failed || req->conn->input_broken || + (req->next != NULL && !http_server_request_is_new(req->next)) || + !http_server_connection_pending_payload(req->conn)); +} + void http_server_request_halt_payload(struct http_server_request *req) { i_assert(req->state <= HTTP_SERVER_REQUEST_STATE_QUEUED);