uri/RedirectHttps: return std::string_view

CM4all · Jan 17, 2025 · 3614855 · 3614855
1 parent 504c585
commit 3614855
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 23 deletions.
diff --git a/src/uri/RedirectHttps.cxx b/src/uri/RedirectHttps.cxx
@@ -7,7 +7,7 @@
 #include "net/HostParser.hxx"
 #include "AllocatorPtr.hxx"
 
-const char *
+std::string_view
 MakeHttpsRedirect(AllocatorPtr alloc, const char *_host, uint16_t port,
 		  const char *uri) noexcept
 {
@@ -27,10 +27,10 @@ MakeHttpsRedirect(AllocatorPtr alloc, const char *_host, uint16_t port,
 		std::find(eh.host.begin(), eh.host.end(), ':') != eh.host.end();
 	const size_t need_brackets = is_ipv6 && !port_sv.empty();
 
-	return alloc.Concat("https://",
-			    std::string_view{&a, need_brackets},
-			    host,
-			    std::string_view{&b, need_brackets},
-			    port_sv,
-			    uri);
+	return alloc.ConcatView("https://",
+				std::string_view{&a, need_brackets},
+				host,
+				std::string_view{&b, need_brackets},
+				port_sv,
+				uri);
 }
diff --git a/src/uri/RedirectHttps.hxx b/src/uri/RedirectHttps.hxx
@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
+#include <string_view>
 
 class AllocatorPtr;
 
@@ -15,6 +16,6 @@ class AllocatorPtr;
  * @param port the new port; 0 means default
  * @param uri the request URI
  */
-const char *
+std::string_view
 MakeHttpsRedirect(AllocatorPtr alloc, const char *host, uint16_t port,
 		  const char *uri) noexcept;
diff --git a/test/uri/TestRedirectHttps.cxx b/test/uri/TestRedirectHttps.cxx
@@ -15,30 +15,30 @@ TEST(TestRedirectHttps, Basic)
 	TestPool pool;
 	const AllocatorPtr alloc(pool);
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "localhost", 0, "/foo"),
-		     "https://localhost/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "localhost", 0, "/foo"),
+		  "https://localhost/foo");
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "localhost:80", 0, "/foo"),
-		     "https://localhost/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "localhost:80", 0, "/foo"),
+		  "https://localhost/foo");
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "localhost:80", 443, "/foo"),
-		     "https://localhost/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "localhost:80", 443, "/foo"),
+		  "https://localhost/foo");
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "localhost:80", 444, "/foo"),
-		     "https://localhost:444/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "localhost:80", 444, "/foo"),
+		  "https://localhost:444/foo");
 }
 
 TEST(TestRedirectHttps, IPv6)
 {
 	TestPool pool;
 	const AllocatorPtr alloc(pool);
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "::", 0, "/foo"),
-		     "https://::/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "::", 0, "/foo"),
+		  "https://::/foo");
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "[::]:80", 0, "/foo"),
-		     "https://::/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "[::]:80", 0, "/foo"),
+		  "https://::/foo");
 
-	ASSERT_STREQ(MakeHttpsRedirect(alloc, "::", 444, "/foo"),
-		     "https://[::]:444/foo");
+	ASSERT_EQ(MakeHttpsRedirect(alloc, "::", 444, "/foo"),
+		  "https://[::]:444/foo");
 }