From 286a514fbe058b18b92c43f82e93824f9702b78c Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Tue, 9 Sep 2014 21:23:37 +0200
Subject: [PATCH] Minor clean up

---
 JsonParser/JsonToken.cpp | 32 ++++++++++++++++----------------
 JsonParser/JsonToken.h   |  3 +++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/JsonParser/JsonToken.cpp b/JsonParser/JsonToken.cpp
index a1041287..27685e3f 100644
--- a/JsonParser/JsonToken.cpp
+++ b/JsonParser/JsonToken.cpp
@@ -7,21 +7,17 @@
 
 using namespace ArduinoJson::Parser;
 
-static char unescapeChar(char c)
+char* JsonToken::getText()
 {
-    // Optimized for code size on a 8-bit AVR
+    char* s = json + token->start;
+    json[token->end] = 0;
 
-    const char* p = "b\bf\fn\nr\rt\t";
+    unescapeString(s);
 
-    while (true)
-    {
-        if (p[0] == 0) return c;
-        if (p[0] == c) return p[1];
-        p += 2;
-    }
+    return s;
 }
 
-static void unescapeString(char* s)
+inline void JsonToken::unescapeString(char* s)
 {
     char* readPtr = s;
     char* writePtr = s;
@@ -29,7 +25,7 @@ static void unescapeString(char* s)
 
     do
     {
-        c = *readPtr++;        
+        c = *readPtr++;
 
         if (c == '\\')
         {
@@ -41,14 +37,18 @@ static void unescapeString(char* s)
     } while (c != 0);
 }
 
-char* JsonToken::getText()
+inline char JsonToken::unescapeChar(char c)
 {
-    char* s = json + token->start;
-    json[token->end] = 0;
+    // Optimized for code size on a 8-bit AVR
 
-    unescapeString(s);
+    const char* p = "b\bf\fn\nr\rt\t";
 
-    return s;
+    while (true)
+    {
+        if (p[0] == 0) return c;
+        if (p[0] == c) return p[1];
+        p += 2;
+    }
 }
 
 JsonToken JsonToken::nextSibling() const
diff --git a/JsonParser/JsonToken.h b/JsonParser/JsonToken.h
index 3d0686d9..3733a7cb 100644
--- a/JsonParser/JsonToken.h
+++ b/JsonParser/JsonToken.h
@@ -91,6 +91,9 @@ namespace ArduinoJson
         private:
             char* json;
             jsmntok_t* token;
+            
+            static char unescapeChar(char c);
+            static void unescapeString(char* s);
         };
     }
 }
\ No newline at end of file