bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-06-25 01:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change StringBuffer::save() to take a VariantData*

Browse Source
This commit is contained in:
Benoit Blanchon
2025-02-28 10:05:50 +01:00
parent 05b68fc7cc
commit 7f75985e47
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ArduinoJson/Memory/StringBuffer.hpp
View File

@ -32,7 +32,22 @@ class StringBuffer {
return node_->data;
}
StringNode* save() {
JsonString str() const {
ARDUINOJSON_ASSERT(node_ != nullptr);
return JsonString(node_->data, node_->length);
}
void save(VariantData* data) {
data->setOwnedString(commitStringNode());
}
void saveRaw(VariantData* data) {
data->setRawString(commitStringNode());
}
private:
StringNode* commitStringNode() {
ARDUINOJSON_ASSERT(node_ != nullptr);
node_->data[size_] = 0;
auto node = resources_->getString(adaptString(node_->data, size_));
@ -52,13 +67,6 @@ class StringBuffer {
return node;
}
JsonString str() const {
ARDUINOJSON_ASSERT(node_ != nullptr);
return JsonString(node_->data, node_->length);
}
private:
ResourceManager* resources_;
StringNode* node_ = nullptr;
size_t size_ = 0;

6
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@ -305,7 +305,7 @@ class MsgPackDeserializer {
if (err)
return err;
variant->setOwnedString(stringBuffer_.save());
stringBuffer_.save(variant);
return DeserializationError::Ok;
}
@ -334,7 +334,7 @@ class MsgPackDeserializer {
if (err)
return err;
variant->setRawString(stringBuffer_.save());
stringBuffer_.saveRaw(variant);
return DeserializationError::Ok;
}
@ -412,7 +412,7 @@ class MsgPackDeserializer {
if (!keyVariant)
return DeserializationError::NoMemory;
keyVariant->setOwnedString(stringBuffer_.save());
stringBuffer_.save(keyVariant);
} else {
member = 0;
}