[Libreoffice-commits] online.git: loolwsd/PrisonerSession.cpp

[Tor Lillqvist]

 loolwsd/PrisonerSession.cpp |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit c46986166c67d0c97e95b7b2db4ecc85d074585d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 3 18:45:58 2016 +0300

    The coding style here is to put 'else if' on one line

diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index cff555e..c40e4da 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -91,8 +91,7 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
             }
         }
     }
-    else
-    if (tokens[0] == "error:")
+    else if (tokens[0] == "error:")
     {
         std::string errorCommand;
         std::string errorKind;
@@ -112,15 +111,13 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
             }
         }
     }
-    else
-    if (tokens[0] == "curpart:" &&
-        tokens.count() == 2 &&
-        getTokenInteger(tokens[1], "part", _curPart))
+    else if (tokens[0] == "curpart:" &&
+             tokens.count() == 2 &&
+             getTokenInteger(tokens[1], "part", _curPart))
     {
         return true;
     }
-    else
-    if (tokens.count() == 2 && tokens[0] == "saveas:")
+    else if (tokens.count() == 2 && tokens[0] == "saveas:")
     {
         std::string url;
         if (!getTokenString(tokens[1], "url", url))