remove wide_string_utils, reuse string_length_byte_read (renamed)

Author: nickdesaulniers

libc/src/string/string_utils.h

@@ -79,7 +79,8 @@ LIBC_INLINE size_t string_length_wide_read(const char *src) {
   return char_ptr - src;
 }
 
-LIBC_INLINE size_t string_length_byte_read(const char *src) {
+template<typename T>
+LIBC_INLINE size_t string_length_trivial(const T *src) {
   size_t length;
   for (length = 0; *src; ++src, ++length)
     ;
@@ -96,7 +97,7 @@ LIBC_INLINE size_t string_length(const char *src) {
   // string a block at a time.
   return string_length_wide_read<unsigned int>(src);
 #else
-  return string_length_byte_read(src);
+  return string_length_trivial(src);
 #endif
 }
 

libc/src/wchar/CMakeLists.txt

@@ -1,19 +1,13 @@
-add_header_library(
-  wide_string_utils
-  HDRS
-    wide_string_utils.h
-)
-
 add_entrypoint_object(
   wcslen
   SRCS
     wcslen.cpp
   HDRS
     wcslen.h
   DEPENDS
-    .wide_string_utils
     libc.hdr.types.size_t
     libc.hdr.types.wchar_t
+    libc.src.string.string_utils
 )
 
 add_entrypoint_object(

libc/src/wchar/wcslen.cpp

@@ -12,12 +12,12 @@
 #include "hdr/types/wchar_t.h"
 #include "src/__support/common.h"
 #include "src/__support/macros/config.h"
-#include "src/wchar/wide_string_utils.h"
+#include "src/string/string_utils.h" // string_length_trivial
 
 namespace LIBC_NAMESPACE_DECL {
 
 LLVM_LIBC_FUNCTION(size_t, wcslen, (const wchar_t *src)) {
-  return internal::wide_string_length(src);
+  return internal::string_length_trivial(src);
 }
 
 } // namespace LIBC_NAMESPACE_DECL