Change kReplacementCharUtf8 type to constexpr string_view

upa-url · Nov 4, 2024 · 64559e5 · 64559e5
1 parent 2758da8
commit 64559e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/include/upa/url_utf.h b/include/upa/url_utf.h
@@ -9,6 +9,7 @@
 #include "url_result.h"
 #include <cstdint> // uint8_t, uint32_t
 #include <string>
+#include <string_view>
 
 
 namespace upa {
@@ -44,7 +45,9 @@ class url_utf {
     static constexpr bool read_code_point(const char16_t*& first, const char16_t* last, uint32_t& code_point) noexcept;
     static constexpr bool read_code_point(const char32_t*& first, const char32_t* last, uint32_t& code_point) noexcept;
 private:
-    const static char kReplacementCharUtf8[];
+    // Replacement character (U+FFFD)
+    static inline constexpr std::string_view kReplacementCharUtf8{ "\xEF\xBF\xBD" };
+
     const static uint8_t k_U8_LEAD3_T1_BITS[16];
     const static uint8_t k_U8_LEAD4_T1_BITS[16];
 };
@@ -95,7 +98,7 @@ inline void url_utf::read_char_append_utf8(const char*& it, const char* last, st
     if (read_code_point(it, last, code_point))
         output.append(start, it);
     else
-        output.append(static_cast<const char*>(kReplacementCharUtf8));
+        output.append(kReplacementCharUtf8);
 }
 
 // ------------------------------------------------------------------------

diff --git a/src/url_utf.cpp b/src/url_utf.cpp
@@ -38,7 +38,7 @@ void url_utf::check_fix_utf8(std::string& str) {
         // replace invalid UTF-8 byte sequences with replacement char
         std::string buff;
         buff.append(first, ptr);
-        buff.append(static_cast<const char*>(kReplacementCharUtf8));
+        buff.append(kReplacementCharUtf8);
 
         const char* bgn = it;
         ptr = it;
@@ -47,7 +47,7 @@ void url_utf::check_fix_utf8(std::string& str) {
                 ptr = it;
             } else {
                 buff.append(bgn, ptr);
-                buff.append(static_cast<const char*>(kReplacementCharUtf8));
+                buff.append(kReplacementCharUtf8);
                 bgn = it;
                 ptr = it;
             }
@@ -93,9 +93,6 @@ int url_utf::compare_by_code_units(const char* first1, const char* last1, const
     return 0;
 }
 
-// Replacement character
-const char url_utf::kReplacementCharUtf8[] = "\xEF\xBF\xBD";
-
 //
 // (c) 2016 and later: Unicode, Inc. and others.
 // License & terms of use: https://www.unicode.org/copyright.html