forked from bblanchon/ArduinoJson
Change StringBuilder::save() to take a VariantData*
This commit is contained in:
@@ -279,7 +279,7 @@ class JsonDeserializer {
|
||||
if (!keyVariant)
|
||||
return DeserializationError::NoMemory;
|
||||
|
||||
keyVariant->setOwnedString(stringBuilder_.save());
|
||||
stringBuilder_.save(keyVariant);
|
||||
} else {
|
||||
member->clear(resources_);
|
||||
}
|
||||
@@ -388,7 +388,7 @@ class JsonDeserializer {
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
variant.setOwnedString(stringBuilder_.save());
|
||||
stringBuilder_.save(&variant);
|
||||
|
||||
return DeserializationError::Ok;
|
||||
}
|
||||
|
||||
@@ -25,7 +25,8 @@ class StringBuilder {
|
||||
node_ = resources_->createString(initialCapacity);
|
||||
}
|
||||
|
||||
StringNode* save() {
|
||||
void save(VariantData* variant) {
|
||||
ARDUINOJSON_ASSERT(variant != nullptr);
|
||||
ARDUINOJSON_ASSERT(node_ != nullptr);
|
||||
node_->data[size_] = 0;
|
||||
StringNode* node = resources_->getString(adaptString(node_->data, size_));
|
||||
@@ -37,7 +38,7 @@ class StringBuilder {
|
||||
} else {
|
||||
node->references++;
|
||||
}
|
||||
return node;
|
||||
variant->setOwnedString(node);
|
||||
}
|
||||
|
||||
void append(const char* s) {
|
||||
|
||||
@@ -230,9 +230,9 @@ class StringBuilderPrint : public Print {
|
||||
copier_.startString();
|
||||
}
|
||||
|
||||
StringNode* save() {
|
||||
void save(VariantData* data) {
|
||||
ARDUINOJSON_ASSERT(!overflowed());
|
||||
return copier_.save();
|
||||
copier_.save(data);
|
||||
}
|
||||
|
||||
size_t write(uint8_t c) {
|
||||
@@ -268,7 +268,7 @@ inline void convertToJson(const ::Printable& src, JsonVariant dst) {
|
||||
src.printTo(print);
|
||||
if (print.overflowed())
|
||||
return;
|
||||
data->setOwnedString(print.save());
|
||||
print.save(data);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user