bp/FileHandler: use ConcatView() where std::string_view is enough

This eliminates unnecessary strlen() calls.
CM4all · Jan 31, 2025 · f5b0bb0 · f5b0bb0
1 parent 37b5af2
commit f5b0bb0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/bp/FileHandler.cxx b/src/bp/FileHandler.cxx
@@ -436,9 +436,9 @@ Request::HandleFileAddressAfterBase(FileDescriptor base, std::string_view strip_
 {
 	const FileAddress &address = *handler.file.address;
 
-	const char *path = address.base != nullptr
-		? AllocatorPtr{pool}.Concat(address.base, address.path)
-		: address.path;
+	std::string_view path{address.path};
+	if (address.base != nullptr)
+		path = AllocatorPtr{pool}.ConcatView(address.base, path);
 
 	static constexpr struct open_how open_read_only{
 		.flags = O_RDONLY|O_NOCTTY|O_CLOEXEC|O_NONBLOCK,
@@ -548,9 +548,9 @@ Request::StatFileAddressAfterBase(FileDescriptor base, std::string_view strip_ba
 
 	const FileAddress &address = *handler.file.address;
 
-	const char *path = address.base != nullptr
-		? AllocatorPtr{pool}.Concat(address.base, address.path)
-		: address.path;
+	std::string_view path{address.path};
+	if (address.base != nullptr)
+		path = AllocatorPtr{pool}.ConcatView(address.base, path);
 
 	static constexpr struct open_how open_read_only{
 		.flags = O_RDONLY|O_NOCTTY|O_CLOEXEC|O_NONBLOCK,