[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLProtocol.cpp loolwsd/LOOLProtocol.hpp loolwsd/MasterProcessSession.cpp

[Tor Lillqvist]

 loolwsd/LOOLBroker.cpp           |   10 +++++-----
 loolwsd/LOOLProtocol.cpp         |    6 +++---
 loolwsd/LOOLProtocol.hpp         |    2 +-
 loolwsd/MasterProcessSession.cpp |    4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6af8a9bbc1723c8d181ca9b1c55ca5c39d487cf1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 23 10:22:18 2016 +0200

    Avoid 'short' and 'signed'

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 1f447a9..a8ed8e3 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -38,7 +38,7 @@ static std::string loolkitPath;
 static std::atomic<unsigned> forkCounter;
 static std::chrono::steady_clock::time_point lastMaintenanceTime = std::chrono::steady_clock::now();
 static unsigned int childCounter = 0;
-static signed numPreSpawnedChildren = 0;
+static int numPreSpawnedChildren = 0;
 
 static std::recursive_mutex forkMutex;
 
@@ -611,7 +611,7 @@ static int createLibreOfficeKit(const bool sharePages,
     return childPID;
 }
 
-static bool waitForTerminationChild(const Process::PID pid, signed count = CHILD_TIMEOUT_SECS)
+static bool waitForTerminationChild(const Process::PID pid, int count = CHILD_TIMEOUT_SECS)
 {
     while (count-- > 0)
     {
@@ -902,12 +902,12 @@ int main(int argc, char** argv)
         {
             std::lock_guard<std::recursive_mutex> lock(forkMutex);
 
-            const signed empty = pipeHandler.syncChilds();
-            const signed total = _childProcesses.size();
+            const int empty = pipeHandler.syncChilds();
+            const int total = _childProcesses.size();
 
             // Figure out how many children we need. Always create at least as many
             // as configured pre-spawn or one more than requested (whichever is larger).
-            signed spawn = std::max(static_cast<int>(forkCounter) + 1, numPreSpawnedChildren);
+            int spawn = std::max(static_cast<int>(forkCounter) + 1, numPreSpawnedChildren);
             Log::debug() << "Creating " << spawn << " childs. Current Total: "
                          << total << ", Empty: " << empty << Log::end;
             do
diff --git a/loolwsd/LOOLProtocol.cpp b/loolwsd/LOOLProtocol.cpp
index 993ef61..7c635be 100644
--- a/loolwsd/LOOLProtocol.cpp
+++ b/loolwsd/LOOLProtocol.cpp
@@ -23,10 +23,10 @@ using Poco::StringTokenizer;
 
 namespace LOOLProtocol
 {
-    std::tuple<signed, signed, std::string> ParseVersion(const std::string& version)
+    std::tuple<int, int, std::string> ParseVersion(const std::string& version)
     {
-        signed major = -1;
-        signed minor = -1;
+        int major = -1;
+        int minor = -1;
         std::string patch;
 
         StringTokenizer firstTokens(version, ".", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
diff --git a/loolwsd/LOOLProtocol.hpp b/loolwsd/LOOLProtocol.hpp
index 26a8f4b..5978041 100644
--- a/loolwsd/LOOLProtocol.hpp
+++ b/loolwsd/LOOLProtocol.hpp
@@ -76,7 +76,7 @@ namespace LOOLProtocol
 
     // Parse a string into a version tuple.
     // Negative numbers for error.
-    std::tuple<signed, signed, std::string> ParseVersion(const std::string& version);
+    std::tuple<int, int, std::string> ParseVersion(const std::string& version);
 
     bool stringToInteger(const std::string& input, int& value);
 	
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 82ece7d..ca9b088 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -754,8 +754,8 @@ void MasterProcessSession::sendCombinedTiles(const char* /*buffer*/, int /*lengt
 
 void MasterProcessSession::dispatchChild()
 {
-    short nRequest = 3;
-    bool  bFound = false;
+    int nRequest = 3;
+    bool bFound = false;
 
     if (_bShutdown)
         return;