feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

ResourceManager: rename string functions

Browse Source
This commit is contained in:
Benoit Blanchon
2023-06-19 11:25:04 +02:00
parent 262747b419
commit 87c96f9306
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/Memory/ResourceManager.hpp
View File

@ -87,30 +87,30 @@ class ResourceManager {
return node; return node;
} }
void addStringToList(StringNode* node) { void saveString(StringNode* node) {
stringPool_.add(node); stringPool_.add(node);
} }
template <typename TAdaptedString> template <typename TAdaptedString>
StringNode* findString(const TAdaptedString& str) const { StringNode* getString(const TAdaptedString& str) const {
return stringPool_.get(str); return stringPool_.get(str);
} }
StringNode* allocString(size_t length) { StringNode* createString(size_t length) {
auto node = StringNode::create(length, allocator_); auto node = StringNode::create(length, allocator_);
if (!node) if (!node)
overflowed_ = true; overflowed_ = true;
return node; return node;
} }
StringNode* reallocString(StringNode* node, size_t length) { StringNode* resizeString(StringNode* node, size_t length) {
node = StringNode::resize(node, length, allocator_); node = StringNode::resize(node, length, allocator_);
if (!node) if (!node)
overflowed_ = true; overflowed_ = true;
return node; return node;
} }
void deallocString(StringNode* node) { void destroyString(StringNode* node) {
StringNode::destroy(node, allocator_); StringNode::destroy(node, allocator_);
} }

12
src/ArduinoJson/Memory/StringBuilder.hpp
View File

@ -16,22 +16,22 @@ class StringBuilder {
~StringBuilder() { ~StringBuilder() {
if (node_) if (node_)
resources_->deallocString(node_); resources_->destroyString(node_);
} }
void startString() { void startString() {
size_ = 0; size_ = 0;
if (!node_) if (!node_)
node_ = resources_->allocString(initialCapacity); node_ = resources_->createString(initialCapacity);
} }
StringNode* save() { StringNode* save() {
ARDUINOJSON_ASSERT(node_ != nullptr); ARDUINOJSON_ASSERT(node_ != nullptr);
node_->data[size_] = 0; node_->data[size_] = 0;
StringNode* node = resources_->findString(adaptString(node_->data, size_)); StringNode* node = resources_->getString(adaptString(node_->data, size_));
if (!node) { if (!node) {
node = resources_->reallocString(node_, size_); node = resources_->resizeString(node_, size_);
resources_->addStringToList(node); resources_->saveString(node);
node_ = nullptr; // next time we need a new string node_ = nullptr; // next time we need a new string
} else { } else {
node->references++; node->references++;
@ -51,7 +51,7 @@ class StringBuilder {
void append(char c) { void append(char c) {
if (node_ && size_ == node_->length) if (node_ && size_ == node_->length)
node_ = resources_->reallocString(node_, size_ * 2U + 1); node_ = resources_->resizeString(node_, size_ * 2U + 1);
if (node_) if (node_)
node_->data[size_++] = c; node_->data[size_++] = c;
} }