From 0b073bc8d13bdf1753fa53276568511dd2f85fb8 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 27 Oct 2014 13:02:51 -0400
Subject: [PATCH] CLI

- Removed unused 'token' arg from ::isUUID.
---
 src/CLI.cpp | 7 +++----
 src/CLI.h   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/CLI.cpp b/src/CLI.cpp
index 2bd254760..648a4b7bd 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -476,8 +476,6 @@ const std::string CLI::dump () const
 // Either the arg is appended to _original_args intact, or the lexemes are.
 void CLI::addArg (const std::string& arg)
 {
-  std::string token;
-
   // Do not lex RC overrides.
   if (arg.length () > 3 &&
       (arg.substr (0, 3) == "rc." ||
@@ -498,7 +496,7 @@ void CLI::addArg (const std::string& arg)
     _original_args.push_back (arg);
 
   // Do not lex UUIDs.
-  else if (isUUID (arg, token))
+  else if (isUUID (arg))
     _original_args.push_back (arg);
 
   // Do not lex, unless lexing reveals OPs.
@@ -1694,12 +1692,13 @@ void CLI::decomposeModSubstitutions ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool CLI::isUUID (const std::string& raw, std::string& token) const
+bool CLI::isUUID (const std::string& raw) const
 {
   // UUIDs have a limited character set.
   if (raw.find_first_not_of ("0123456789abcdefABCDEF-,") == std::string::npos)
   {
     Nibbler n (raw);
+    std::string token;
     if (n.getUUID (token) || n.getPartialUUID (token))
       return true;
   }
diff --git a/src/CLI.h b/src/CLI.h
index d21f6b38e..009dfff0d 100644
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -98,7 +98,7 @@ private:
   void decomposeModTags ();
   void decomposeModSubstitutions ();
 
-  bool isUUID (const std::string&, std::string&) const;
+  bool isUUID (const std::string&) const;
 
 public:
   std::multimap <std::string, std::string> _entities;