Minor changes

This commit is contained in:
Benoît Blanchon
2014-07-09 13:30:08 +02:00
parent a48fbac7d7
commit 4e61a839a5

View File

@ -11,7 +11,7 @@ static inline char getSpecialChar(char c)
{
// 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)
{
@ -24,37 +24,24 @@ static inline char getSpecialChar(char c)
static inline size_t printCharTo(char c, Print& p)
{
char specialChar = getSpecialChar(c);
if (specialChar)
{
return p.write('\\') + p.write(specialChar);
}
else
{
return p.write(c);
}
return specialChar != 0
? p.write('\\') + p.write(specialChar)
: p.write(c);
}
size_t EscapedString::printTo(Print& p) const
{
const char* s = rawString;
if (!s)
{
return p.print("null");
}
if (!s) return p.print("null");
size_t n = 0;
n += p.write('\"');
size_t n = p.write('\"');
while (*s)
{
n += printCharTo(*s, p);
s++;
n += printCharTo(*s++, p);
}
n += p.write('\"');
return n;
return n + p.write('\"');
}