From 158f4600fb20f9fd6a6a6498f0c1c09fb7e15363 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 1 Aug 2014 15:27:58 +0200 Subject: [PATCH] Added static EscapedString::printTo --- JsonGenerator/EscapedString.cpp | 4 +--- JsonGenerator/EscapedString.h | 7 ++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/JsonGenerator/EscapedString.cpp b/JsonGenerator/EscapedString.cpp index 9f6988a2..4253d323 100644 --- a/JsonGenerator/EscapedString.cpp +++ b/JsonGenerator/EscapedString.cpp @@ -30,10 +30,8 @@ static inline size_t printCharTo(char c, Print& p) : p.write(c); } -size_t EscapedString::printTo(Print& p) const +size_t EscapedString::printTo(const char* s, Print& p) { - const char* s = rawString; - if (!s) return p.print("null"); size_t n = p.write('\"'); diff --git a/JsonGenerator/EscapedString.h b/JsonGenerator/EscapedString.h index c9ef776f..232ede4e 100644 --- a/JsonGenerator/EscapedString.h +++ b/JsonGenerator/EscapedString.h @@ -20,10 +20,15 @@ namespace ArduinoJson { } - size_t printTo(Print&) const; + size_t printTo(Print& p) const + { + return printTo(rawString, p); + } private: const char* rawString; + + static size_t printTo(const char*, Print&); }; } } \ No newline at end of file