bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-30 18:57:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

VariantImpl: change setRawString() to return bool

Browse Source
This commit is contained in:
Benoit Blanchon
2025-07-16 12:11:58 +02:00
parent 3793996d83
commit 38f61d322f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@ -173,10 +173,10 @@ inline detail::enable_if_t<detail::IsString<T>::value> convertToJson(
// SerializedValue<const __FlashStringHelper*> // SerializedValue<const __FlashStringHelper*>
template <typename T> template <typename T>
struct Converter<SerializedValue<T>> : private detail::VariantAttorney { struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
static void toJson(SerializedValue<T> src, JsonVariant dst) { static bool toJson(SerializedValue<T> src, JsonVariant dst) {
auto variant = getImpl(dst); auto variant = getImpl(dst);
variant.clear(); variant.clear();
variant.setRawString(detail::adaptString(src.data(), src.size())); return variant.setRawString(detail::adaptString(src.data(), src.size()));
} }
}; };

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

@ -441,12 +441,14 @@ class VariantImpl {
} }
template <typename TAdaptedString> template <typename TAdaptedString>
void setRawString(TAdaptedString value) { bool setRawString(TAdaptedString value) {
if (!data_) if (!data_)
return; return false;
auto dup = resources_->saveString(value); auto dup = resources_->saveString(value);
if (dup) if (!dup)
data_->setRawString(dup); return false;
data_->setRawString(dup);
return true;
} }
template <typename TAdaptedString> template <typename TAdaptedString>