bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-09-25 14:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extract setString()

Browse Source 
Before: 9802, 8736, 9630, 12588, 9910
After:  9802, 8718, 9630, 12606, 9880
Target: 9800, 8458, 9634, 12290, 9702
This commit is contained in:
Benoit Blanchon
2025-09-17 22:12:56 +02:00
parent 7585c0f671
commit bc8dcff2ab
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ArduinoJson/Object/ObjectImpl.hpp
View File

@@ -61,8 +61,7 @@ inline VariantData* ObjectImpl::addMember(TAdaptedString key) {
if (!valueSlot) if (!valueSlot)
return nullptr; return nullptr;
VariantImpl keyImpl(keySlot.ptr(), resources_); if (!VariantImpl::setString(key, keySlot.ptr(), resources_))
if (!keyImpl.setString(key))
return nullptr; return nullptr;
CollectionImpl::appendPair(keySlot, valueSlot); CollectionImpl::appendPair(keySlot, valueSlot);

9
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -480,7 +480,14 @@ class VariantImpl {
void setRawString(SerializedValue<T> value); void setRawString(SerializedValue<T> value);
template <typename TAdaptedString> template <typename TAdaptedString>
bool setString(TAdaptedString value); bool setString(TAdaptedString value) {
if (!data_)
return false;
return setString(value, data_, resources_);
}
template <typename TAdaptedString>
static bool setString(TAdaptedString value, VariantData*, ResourceManager*);
size_t size() { size_t size() {
if (isObject()) if (isObject())

10
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -19,11 +19,11 @@ inline void VariantImpl::setRawString(SerializedValue<T> value) {
} }
template <typename TAdaptedString> template <typename TAdaptedString>
inline bool VariantImpl::setString(TAdaptedString value) { inline bool VariantImpl::setString(TAdaptedString value, VariantData* data_,
ARDUINOJSON_ASSERT(isNull()); // must call clear() first ResourceManager* resources_) {
ARDUINOJSON_ASSERT(data_ != nullptr);
if (!data_) ARDUINOJSON_ASSERT(data_->type == VariantType::Null);
return false; ARDUINOJSON_ASSERT(resources_ != nullptr);
if (value.isNull()) if (value.isNull())
return false; return false;