[libc][NFC] Make strchr and strrchr more consistent

Reviewed By: sivachandra

Differential Revision: https://reviews.llvm.org/D110581

diff --git a/libc/src/string/strchr.cpp b/libc/src/string/strchr.cpp
index 6288b64b74628ed5f6f0d71d16b131b3a555a626..ab663eac500e189fb1831e01b95da0f022136e58 100644 (file)
--- a/libc/src/string/strchr.cpp
+++ b/libc/src/string/strchr.cpp
@@ -14,12 +14,10 @@ namespace __llvm_libc {
 
 // TODO: Look at performance benefits of comparing words.
 LLVM_LIBC_FUNCTION(char *, strchr, (const char *src, int c)) {
-  unsigned char *str =
-      const_cast<unsigned char *>(reinterpret_cast<const unsigned char *>(src));
-  const unsigned char ch = c;
-  for (; *str && *str != ch; ++str)
+  const char ch = c;
+  for (; *src && *src != ch; ++src)
     ;
-  return *str == ch ? reinterpret_cast<char *>(str) : nullptr;
+  return *src == ch ? const_cast<char *>(src) : nullptr;
 }
 
 } // namespace __llvm_libc

diff --git a/libc/src/string/strrchr.cpp b/libc/src/string/strrchr.cpp
index 33a638bacd8625c1b45d06281d8f223efb73e3f1..b5852add7fe9ad11f63be2693a21ebd15b6aa75d 100644 (file)
--- a/libc/src/string/strrchr.cpp
+++ b/libc/src/string/strrchr.cpp
@@ -15,10 +15,10 @@ namespace __llvm_libc {
 LLVM_LIBC_FUNCTION(char *, strrchr, (const char *src, int c)) {
   const char ch = c;
   char *last_occurrence = nullptr;
-  do {
+  for (; *src; ++src) {
     if (*src == ch)
       last_occurrence = const_cast<char *>(src);
-  } while (*src++);
+  }
   return last_occurrence;
 }