removed redundant bool

Author: uzairnawaz

libc/src/__support/wchar/string_converter.h

@@ -30,11 +30,6 @@ template <typename T> class StringConverter {
   // # of pops we are allowed to perform (essentially size of the dest buffer)
   size_t num_to_write;
 
-  // on the very first pop, we need to make sure that we always
-  // pushFullCharacter in case a previous StringConverter pushed part of a
-  // character to the mbstate
-  bool first_pop;
-
   ErrorOr<size_t> pushFullCharacter() {
     size_t num_pushed;
     for (num_pushed = 0; !cr.isFull() && src_idx + num_pushed < src_len;
@@ -56,14 +51,12 @@ template <typename T> class StringConverter {
 public:
   StringConverter(const T *s, mbstate *ps, size_t dstlen,
                   size_t srclen = SIZE_MAX)
-      : cr(ps), src(s), src_len(srclen), src_idx(0), num_to_write(dstlen),
-        first_pop(true) {}
+      : cr(ps), src(s), src_len(srclen), src_idx(0), num_to_write(dstlen) {}
 
   // TODO: following functions are almost identical
   // look into templating CharacterConverter pop functions
   ErrorOr<char32_t> popUTF32() {
-    if (cr.isEmpty() || first_pop) {
-      first_pop = false;
+    if (cr.isEmpty() || src_idx == 0) {
       auto src_elements_read = pushFullCharacter();
       if (!src_elements_read.has_value())
         return Error(src_elements_read.error());
@@ -86,8 +79,7 @@ template <typename T> class StringConverter {
   }
 
   ErrorOr<char8_t> popUTF8() {
-    if (cr.isEmpty() || first_pop) {
-      first_pop = false;
+    if (cr.isEmpty() || src_idx == 0) {
       auto src_elements_read = pushFullCharacter();
       if (!src_elements_read.has_value())
         return Error(src_elements_read.error());

libc/test/src/__support/wchar/string_converter_test.cpp

@@ -306,7 +306,7 @@ TEST(LlvmLibcStringConverterTest, DestLimitUTF8To32) {
   const char *src = "\xF0\x9F\xA4\xA1\xF0\x9F\xA4\xA1"; // 2 clown emojis
   LIBC_NAMESPACE::internal::mbstate state;
   LIBC_NAMESPACE::internal::StringConverter<char8_t> sc(
-      reinterpret_cast<const char8_t *>(src), &state, 1, SIZE_MAX);
+      reinterpret_cast<const char8_t *>(src), &state, 1);
 
   auto res = sc.popUTF32();
   ASSERT_TRUE(res.has_value());
@@ -320,7 +320,7 @@ TEST(LlvmLibcStringConverterTest, DestLimitUTF32To8) {
   const wchar_t *src = L"\x1f921\x1f921"; // 2 clown emojis
   LIBC_NAMESPACE::internal::mbstate state;
   LIBC_NAMESPACE::internal::StringConverter<char32_t> sc(
-      reinterpret_cast<const char32_t *>(src), &state, 5, SIZE_MAX);
+      reinterpret_cast<const char32_t *>(src), &state, 5);
 
   auto res = sc.popUTF8();
   ASSERT_TRUE(res.has_value());