From 96ca7eb5f2d1e31d590b8f70b4bb5ae3f9362e53 Mon Sep 17 00:00:00 2001
From: Wilhelm Schuermann <wimschuermann@googlemail.com>
Date: Thu, 12 Nov 2015 13:36:23 +0100
Subject: [PATCH] Nibbler: Remove unused function argument

---
 src/JSON.cpp       |  4 ++--
 src/Nibbler.cpp    |  8 +-------
 src/Nibbler.h      |  2 +-
 test/nibbler.t.cpp | 26 +++++++-------------------
 4 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/JSON.cpp b/src/JSON.cpp
index 2db944f88..76f115840 100644
--- a/src/JSON.cpp
+++ b/src/JSON.cpp
@@ -66,7 +66,7 @@ json::string::string (const std::string& other)
 json::string* json::string::parse (Nibbler& nibbler)
 {
   std::string value;
-  if (nibbler.getQuoted ('"', value, false))
+  if (nibbler.getQuoted ('"', value))
   {
     json::string* s = new json::string ();
     s->_data = value;
@@ -303,7 +303,7 @@ bool json::object::parse_pair (
 {
   Nibbler n (nibbler);
 
-  if (n.getQuoted ('"', name, false))
+  if (n.getQuoted ('"', name))
   {
     n.skipWS ();
     if (n.skip (':'))
diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index 94b13d0c0..b42844d91 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -180,10 +180,7 @@ bool Nibbler::getN (const int quantity, std::string& result)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Nibbler::getQuoted (
-  char c,
-  std::string& result,
-  bool quote /* = false */)
+bool Nibbler::getQuoted (char c, std::string& result)
 {
   bool inquote = false;
   bool inescape = false;
@@ -210,9 +207,6 @@ bool Nibbler::getQuoted (
 
     if (current == c && !inescape)
     {
-      if (quote)
-        result += current;
-
       if (!inquote)
       {
         inquote = true;
diff --git a/src/Nibbler.h b/src/Nibbler.h
index 9b920b093..461acb578 100644
--- a/src/Nibbler.h
+++ b/src/Nibbler.h
@@ -48,7 +48,7 @@ public:
   bool getUntilEOS (std::string&);
 
   bool getN (const int, std::string&);
-  bool getQuoted (char, std::string&, bool quote = false);
+  bool getQuoted (char, std::string&);
   bool getDigit (int&);
   bool getDigit4 (int&);
   bool getDigit3 (int&);
diff --git a/test/nibbler.t.cpp b/test/nibbler.t.cpp
index 333faaa49..59c912915 100644
--- a/test/nibbler.t.cpp
+++ b/test/nibbler.t.cpp
@@ -35,7 +35,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int, char**)
 {
-  UnitTest t (240);
+  UnitTest t (236);
 
   // Ensure environment has no influence.
   unsetenv ("TASKDATA");
@@ -167,28 +167,16 @@ int main (int, char**)
     t.notok (n.getQuoted ('\'', s),   "\"one\\\"two\" :      getQuoted (''')    -> false");
 
     n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s, false), "\"one\\\"two\" :      getQuoted ('\"', false, false) -> true");
-    t.is (s, "one\\\"two", "getQuoted ('\"', false) -> one\\\"two");
+    t.ok (n.getQuoted ('"', s), "\"one\\\"two\" :      getQuoted ('\"', s) -> true");
+    t.is (s, "one\\\"two", "getQuoted ('\"', s) -> one\\\"two");
 
     n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s, true),  "\"one\\\"two\" :      getQuoted ('\"', false, true)  -> true");
-    t.is (s, "\"one\\\"two\"", "getQuoted ('\"', true) -> \"one\\\"two\"");
-
-    n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s, false), "\"one\\\"two\" :      getQuoted ('\"', true,  false) -> true");
-    t.is (s, "one\\\"two", "getQuoted ('\"', false) -> one\\\"two");
-
-    n = Nibbler ("\"one\\\"two\"");
-    t.ok (n.getQuoted ('"', s, true),  "\"one\\\"two\" :      getQuoted ('\"', s,  true)  -> true");
-    t.is (s, "\"one\\\"two\"", "getQuoted ('\"', s, true) -> \"one\\\"two\"");
+    t.ok (n.getQuoted ('"', s), "\"one\\\"two\" :      getQuoted ('\"', s) -> true");
+    t.is (s, "one\\\"two", "getQuoted ('\"', s) -> one\\\"two");
 
     n = Nibbler ("\"one\\\\\"");
-    t.ok (n.getQuoted ('\"', s, true), "\"one\\\" :           getQuoted ('\"', s, true)      -> true");
-    t.is (s, "\"one\\\\\"",                                   "getQuoted ('\"', s, true)      -> \"one\\\\\"");
-
-    n = Nibbler ("\"one\\\\\"");
-    t.ok (n.getQuoted ('\"', s, false), "one\\ :              getQuoted ('\"', s, false)      -> true");
-    t.is (s, "one\\\\",                                       "getQuoted ('\"', s, false)      -> \"one\\\\\"");
+    t.ok (n.getQuoted ('\"', s), "one\\ :              getQuoted ('\"', s)      -> true");
+    t.is (s, "one\\\\",                                       "getQuoted ('\"', s)      -> \"one\\\\\"");
 
     // bool getDigit (int&);
     t.diag ("Nibbler::getDigit");