Extract isTinyString()

Author: bblanchon

src/ArduinoJson/Variant/VariantData.hpp

@@ -17,6 +17,16 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 template <typename T>
 T parseNumber(const char* s);
 
+template <typename T>
+static bool isTinyString(const T& s, size_t n) {
+  if (n > tinyStringMaxLength)
+    return false;
+  bool containsNul = false;
+  for (uint8_t i = 0; i < uint8_t(n); i++)
+    containsNul |= !s[i];
+  return !containsNul;
+}
+
 class VariantData {
   VariantContent content_;  // must be first to allow cast from array to variant
   VariantType type_;

src/ArduinoJson/Variant/VariantImpl.hpp

@@ -31,15 +31,9 @@ inline bool VariantData::setString(TAdaptedString value,
     return true;
   }
 
-  if (value.size() <= tinyStringMaxLength) {
-    uint8_t length = static_cast<uint8_t>(value.size());
-    bool containsNul = false;
-    for (uint8_t i = 0; i < length; i++)
-      containsNul |= !value[i];
-    if (!containsNul) {
-      setTinyString(value.data(), length);
-      return true;
-    }
+  if (isTinyString(value, value.size())) {
+    setTinyString(value.data(), uint8_t(value.size()));
+    return true;
   }
 
   auto dup = resources->saveString(value);