From 09514c78d56537b46b92ce3829af2dc41a2f5bae Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Mon, 11 Nov 2019 17:20:48 +0100 Subject: [PATCH] lib-http: http-server-request - Make http_server_request_label() a normal function. --- src/lib-http/http-server-private.h | 15 ++------------- src/lib-http/http-server-request.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/lib-http/http-server-private.h b/src/lib-http/http-server-private.h index 2ad9aab80d..44ec84ea72 100644 --- a/src/lib-http/http-server-private.h +++ b/src/lib-http/http-server-private.h @@ -179,19 +179,6 @@ int http_server_response_send_more(struct http_server_response *resp); * Request */ -static inline const char * -http_server_request_label(struct http_server_request *req) -{ - if (req->req.target_raw == NULL) { - if (req->req.method == NULL) - return t_strdup_printf("[Req%u: ]", req->id); - return t_strdup_printf("[Req%u: %s ]", - req->id, req->req.method); - } - return t_strdup_printf("[Req%u: %s %s]", req->id, - req->req.method, req->req.target_raw); -} - static inline bool http_server_request_is_new(struct http_server_request *req) { @@ -206,6 +193,8 @@ http_server_request_version_equals(struct http_server_request *req, req->req.version_minor == minor); } +const char *http_server_request_label(struct http_server_request *req); + struct http_server_request * http_server_request_new(struct http_server_connection *conn); void http_server_request_destroy(struct http_server_request **_req); diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c index 20c20ea7b8..9c7f33f87c 100644 --- a/src/lib-http/http-server-request.c +++ b/src/lib-http/http-server-request.c @@ -69,6 +69,18 @@ http_server_request_client_error(struct http_server_request *req, * Request */ +const char *http_server_request_label(struct http_server_request *req) +{ + if (req->req.target_raw == NULL) { + if (req->req.method == NULL) + return t_strdup_printf("[Req%u: ]", req->id); + return t_strdup_printf("[Req%u: %s ]", + req->id, req->req.method); + } + return t_strdup_printf("[Req%u: %s %s]", req->id, + req->req.method, req->req.target_raw); +} + struct http_server_request * http_server_request_new(struct http_server_connection *conn) { -- 2.47.3