http/Status: http_status_to_string() returns std::string_view

CM4all · Jan 17, 2025 · 7840bc0 · 7840bc0
1 parent 53e0a75
commit 7840bc0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/libcommon b/libcommon
diff --git a/src/http/server/Send.cxx b/src/http/server/Send.cxx
@@ -62,12 +62,10 @@ format_status_line(char *p, HttpStatus status) noexcept
 {
 	assert(http_status_is_valid(status));
 
-	const char *status_string = http_status_to_string(status);
-	assert(status_string != nullptr);
-	std::size_t length = strlen(status_string);
+	const std::string_view status_string = http_status_to_string(status);
 
 	p = (char *)mempcpy(p, "HTTP/1.1 ", 9);
-	p = (char *)mempcpy(p, status_string, length);
+	p = std::copy(status_string.begin(), status_string.end(), p);
 	*p++ = '\r';
 	*p++ = '\n';
 

diff --git a/src/lb/TranslationHttpRequestHandler.cxx b/src/lb/TranslationHttpRequestHandler.cxx
@@ -126,7 +126,7 @@ LbHttpRequest::OnTranslateResponse(UniquePoolPtr<TranslateResponse> _response) n
 
 		const std::string_view body = response.message != nullptr
 			? std::string_view{response.message}
-			: std::string_view{http_status_to_string(status)};
+			: http_status_to_string(status);
 
 		_request.SendSimpleResponse(status, location, body);
 	} else if (response.pool != nullptr) {