array conversions

Signed-off-by: Rosen Penev <rosenp@gmail.com>

src/util/UriUtil.cxx

@@ -31,6 +31,7 @@
 #include "ASCII.hxx"
 #include "SplitString.hxx"
 
+#include <array>
 #include <cassert>
 #include <cstring>
 
@@ -73,7 +74,7 @@ gcc_pure
 static const char *
 SkipUriScheme(const char *uri) noexcept
 {
-	static const char *const schemes[] = {
+	static constexpr auto schemes = std::array {
 		"http://", "https://",
 		"ftp://",
 		"smb://",
@@ -100,7 +101,7 @@ uri_remove_auth(const char *uri) noexcept
 	if (slash == nullptr)
 		slash = auth + strlen(auth);
 
-	const char *at = (const char *)std::memchr(auth, '@', slash - auth);
+	auto at = (const char *)std::memchr(auth, '@', slash - auth);
 	if (at == nullptr)
 		/* no auth info present, do nothing */
 		return std::string();