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

Use EscapedString for keys in JsonHashTable

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-07 13:48:50 +02:00
parent 1b62502b36
commit b3613f7137
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
JsonGenerator/EscapedString.h
View File

@@ -10,10 +10,10 @@
class EscapedString
{
public:
EscapedString(const char* s)
: rawString(s)
{
void set(const char* s)
{
rawString = s;
}
size_t printTo(Print&) const;

12
JsonGenerator/JsonHashTable.h
View File

@@ -5,6 +5,7 @@
#pragma once
#include "EscapedString.h"
#include "JsonObjectBase.h"
namespace ArduinoJson
@@ -26,7 +27,7 @@ namespace ArduinoJson
{
if (itemCount >= N) return;
items[itemCount].key = key;
items[itemCount].key.set(key);
items[itemCount].value.set(value);
itemCount++;
}
@@ -36,7 +37,7 @@ namespace ArduinoJson
{
if (itemCount >= N) return;
items[itemCount].key = key;
items[itemCount].key.set(key);
items[itemCount].value.set<DIGITS>(value);
itemCount++;
}
@@ -47,7 +48,7 @@ namespace ArduinoJson
struct KeyValuePair
{
const char* key;
EscapedString key;
JsonValue value;
};
@@ -62,15 +63,12 @@ namespace ArduinoJson
for (int i = 0; i < itemCount; i++)
{
JsonValue key;
key.set(items[i].key);
if (i > 0)
{
n += p.write(',');
}
n += key.printTo(p);
n += items[i].key.printTo(p);
n += p.write(':');
n += items[i].value.printTo(p);
}

3
JsonGenerator/JsonValue.cpp
View File

@@ -28,6 +28,5 @@ size_t JsonValue::printPrintableTo(const Content& c, Print& p)
size_t JsonValue::printStringTo(const Content& c, Print& p)
{
EscapedString s(c.asString);
return s.printTo(p);
return c.asString.printTo(p);
}

13
JsonGenerator/JsonValue.h
View File

@@ -5,6 +5,7 @@
#pragma once
#include "EscapedString.h"
#include "Printable.h"
#include "StringBuilder.h"
@@ -43,7 +44,7 @@ namespace ArduinoJson
void set(const char* value)
{
printToImpl = &printStringTo;
content.asString = value;
content.asString.set(value);
}
template<int DIGITS=2>
@@ -62,11 +63,11 @@ namespace ArduinoJson
private:
union Content
{
bool asBool;
long asLong;
Printable* asPrintable;
const char* asString;
double asDouble;
bool asBool;
long asLong;
Printable* asPrintable;
EscapedString asString;
double asDouble;
};
Content content;