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

Minor changes

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-09 13:30:08 +02:00
parent a48fbac7d7
commit 4e61a839a5
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
JsonGenerator/EscapedString.cpp
View File

@ -11,7 +11,7 @@ static inline char getSpecialChar(char c)
{ {
// Optimized for code size on a 8-bit AVR // Optimized for code size on a 8-bit AVR
const char*p = "\"\"\\\\\bb\ff\nn\rr\tt\0"; const char* p = "\"\"\\\\\bb\ff\nn\rr\tt\0";
while (p[0] && p[0] != c) while (p[0] && p[0] != c)
{ {
@ -24,37 +24,24 @@ static inline char getSpecialChar(char c)
static inline size_t printCharTo(char c, Print& p) static inline size_t printCharTo(char c, Print& p)
{ {
char specialChar = getSpecialChar(c); char specialChar = getSpecialChar(c);
if (specialChar)
{ return specialChar != 0
return p.write('\\') + p.write(specialChar); ? p.write('\\') + p.write(specialChar)
} : p.write(c);
else
{
return p.write(c);
}
} }
size_t EscapedString::printTo(Print& p) const size_t EscapedString::printTo(Print& p) const
{ {
const char* s = rawString; const char* s = rawString;
if (!s) if (!s) return p.print("null");
{
return p.print("null");
}
size_t n = 0; size_t n = p.write('\"');
n += p.write('\"');
while (*s) while (*s)
{ {
n += printCharTo(*s, p); n += printCharTo(*s++, p);
s++;
} }
n += p.write('\"'); return n + p.write('\"');
return n;
} }