[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Michael Meeks (via logerrit)]

 wsd/DocumentBroker.cpp |    2 +-
 wsd/LOOLWSD.cpp        |    7 ++-----
 wsd/LOOLWSD.hpp        |    8 ++------
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit fdd4b4f63ddd16679a5a7035aa14d6e02fd57fdd
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat May 2 19:14:05 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat May 2 21:31:25 2020 +0200

    mobile: remove a few conditionals.
    
    Change-Id: I5f306904b0b0533290d5533bbc3452217689eaec
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93324
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index b6defa9d5..801343c63 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -228,7 +228,7 @@ void DocumentBroker::pollThread()
     do
     {
         static const int timeoutMs = COMMAND_TIMEOUT_MS * 5;
-        _childProcess = getNewChild_Blocks();
+        _childProcess = getNewChild_Blocks(getPublicUri().getPath());
         if (_childProcess ||
             std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() -
                                                                   _threadStart).count() > timeoutMs)
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f4812ff30..dbe119067 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -491,17 +491,14 @@ static size_t addNewChild(const std::shared_ptr<ChildProcess>& child)
 std::mutex LOOLWSD::lokit_main_mutex;
 #endif
 
-std::shared_ptr<ChildProcess> getNewChild_Blocks(
-#if MOBILEAPP
-                                                 const std::string& uri
-#endif
-                                                 )
+std::shared_ptr<ChildProcess> getNewChild_Blocks(const std::string& uri)
 {
     std::unique_lock<std::mutex> lock(NewChildrenMutex);
 
     const auto startTime = std::chrono::steady_clock::now();
 
 #if !MOBILEAPP
+    (void)uri;
     LOG_DBG("getNewChild: Rebalancing children.");
     int numPreSpawn = LOOLWSD::NumPreSpawnedChildren;
     ++numPreSpawn; // Replace the one we'll dispatch just now.
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index f2f7e0abc..dc0a68e06 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -32,15 +32,11 @@ class TraceFileWriter;
 class DocumentBroker;
 class ClipboardCache;
 
-std::shared_ptr<ChildProcess> getNewChild_Blocks(
-#if MOBILEAPP
-                                                 const std::string& uri
-#endif
-                                                 );
+std::shared_ptr<ChildProcess> getNewChild_Blocks(const std::string& uri);
+
 // A WSProcess object in the WSD process represents a descendant process, either the direct child
 // process FORKIT or a grandchild KIT process, with which the WSD process communicates through a
 // WebSocket.
-
 class WSProcess
 {
 public: