github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 08:48:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace CopiedString and LinkedString with JsonString

Browse Source
This commit is contained in:
Benoit Blanchon
2022-01-13 16:15:53 +01:00
parent 973858b835
commit 4f6244eef4
11 changed files with 26 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/StringStorage/StringCopier.hpp
View File

@@ -10,8 +10,6 @@ namespace ARDUINOJSON_NAMESPACE {
class StringCopier {
public:
typedef CopiedString string_type;
StringCopier(MemoryPool& pool) : _pool(&pool) {}
void startString() {
@@ -21,10 +19,10 @@ class StringCopier {
_pool->markAsOverflowed();
}
string_type save() {
String save() {
ARDUINOJSON_ASSERT(_ptr);
ARDUINOJSON_ASSERT(_size < _capacity); // needs room for the terminator
return string_type(_pool->saveStringFromFreeZone(_size), _size);
return String(_pool->saveStringFromFreeZone(_size), _size, false);
}
void append(const char* s) {
@@ -50,11 +48,11 @@ class StringCopier {
return _size;
}
string_type str() const {
String str() const {
ARDUINOJSON_ASSERT(_ptr);
ARDUINOJSON_ASSERT(_size < _capacity);
_ptr[_size] = 0;
return string_type(_ptr, _size);
return String(_ptr, _size, false);
}
private: