From 87c96f930601f9458086e76f03dcefbfbf5b816e Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 19 Jun 2023 11:25:04 +0200 Subject: [PATCH] ResourceManager: rename string functions --- src/ArduinoJson/Memory/ResourceManager.hpp | 10 +++++----- src/ArduinoJson/Memory/StringBuilder.hpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ArduinoJson/Memory/ResourceManager.hpp b/src/ArduinoJson/Memory/ResourceManager.hpp index af7c840c..f3a4942d 100644 --- a/src/ArduinoJson/Memory/ResourceManager.hpp +++ b/src/ArduinoJson/Memory/ResourceManager.hpp @@ -87,30 +87,30 @@ class ResourceManager { return node; } - void addStringToList(StringNode* node) { + void saveString(StringNode* node) { stringPool_.add(node); } template - StringNode* findString(const TAdaptedString& str) const { + StringNode* getString(const TAdaptedString& str) const { return stringPool_.get(str); } - StringNode* allocString(size_t length) { + StringNode* createString(size_t length) { auto node = StringNode::create(length, allocator_); if (!node) overflowed_ = true; return node; } - StringNode* reallocString(StringNode* node, size_t length) { + StringNode* resizeString(StringNode* node, size_t length) { node = StringNode::resize(node, length, allocator_); if (!node) overflowed_ = true; return node; } - void deallocString(StringNode* node) { + void destroyString(StringNode* node) { StringNode::destroy(node, allocator_); } diff --git a/src/ArduinoJson/Memory/StringBuilder.hpp b/src/ArduinoJson/Memory/StringBuilder.hpp index 8a167508..497ea8dd 100644 --- a/src/ArduinoJson/Memory/StringBuilder.hpp +++ b/src/ArduinoJson/Memory/StringBuilder.hpp @@ -16,22 +16,22 @@ class StringBuilder { ~StringBuilder() { if (node_) - resources_->deallocString(node_); + resources_->destroyString(node_); } void startString() { size_ = 0; if (!node_) - node_ = resources_->allocString(initialCapacity); + node_ = resources_->createString(initialCapacity); } StringNode* save() { ARDUINOJSON_ASSERT(node_ != nullptr); node_->data[size_] = 0; - StringNode* node = resources_->findString(adaptString(node_->data, size_)); + StringNode* node = resources_->getString(adaptString(node_->data, size_)); if (!node) { - node = resources_->reallocString(node_, size_); - resources_->addStringToList(node); + node = resources_->resizeString(node_, size_); + resources_->saveString(node); node_ = nullptr; // next time we need a new string } else { node->references++; @@ -51,7 +51,7 @@ class StringBuilder { void append(char c) { if (node_ && size_ == node_->length) - node_ = resources_->reallocString(node_, size_ * 2U + 1); + node_ = resources_->resizeString(node_, size_ * 2U + 1); if (node_) node_->data[size_++] = c; }