From 5345c07c9f7035f8cdae2cea8e4144776600222e Mon Sep 17 00:00:00 2001
From: Nathan Osman <admin@quickmediasolutions.com>
Date: Thu, 1 Aug 2013 12:38:58 -0700
Subject: [PATCH] Fixed lexer bug and removed warning signal, replacing it with
 a call to qWarning().

---
 src/lexer.cpp  | 6 ++++--
 src/parser.cpp | 2 +-
 src/parser.h   | 2 --
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lexer.cpp b/src/lexer.cpp
index 045b796..4fbe2fc 100644
--- a/src/lexer.cpp
+++ b/src/lexer.cpp
@@ -22,8 +22,8 @@ void Lexer::readData()
         switch(state)
         {
             case ReadingLength:
-            case ReadingUnsafeString: if(!readUnsafeString()) return; break;
-            case ReadingSafeString:   if(!readSafeString())   return; break;
+            case ReadingUnsafeString: if(!readUnsafeString()) return;
+            case ReadingSafeString:   if(!readSafeString())   return;
         }
 
         if(state != ReadingSafeString)
@@ -86,5 +86,7 @@ bool Lexer::readSafeString()
     buffer.remove(0, length + 2);
 
     emit safeString(d);
+
+    state = DoingNothing;
     return true;
 }
diff --git a/src/parser.cpp b/src/parser.cpp
index 906738f..695a1bc 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -22,7 +22,7 @@ void Parser::readCharacter(char c)
         case '$': stack.append(Task(Task::ReadBulk));      break;
         case '*': stack.append(Task(Task::ReadMultiBulk)); break;
         default:
-            emit warning(tr("Skipping unexpected character '%1'").arg(static_cast<int>(c), 0, 16));
+            qWarning("Skipping unexpected character '%x'", static_cast<int>(c));
             break;
     }
 }
diff --git a/src/parser.h b/src/parser.h
index d93edfe..782d565 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -25,8 +25,6 @@ class Parser : public QObject
         void bulk(const QByteArray &);
         void multiBulk(const QVariantList &);
 
-        void warning(const QString &);
-
     private Q_SLOTS:
 
         void readCharacter(char);