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

[Tor Lillqvist]

 loolwsd/LOOLBroker.cpp |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 9a15bc6c2cc805518e0012dd527196ed6fc6e894
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 12 14:01:07 2016 +0200

    Zero is a valid return value from open()
    
    Sure, it is highly likely that fd 0 is already in other use, but let's
    be correct.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index a8e70a4..970882e 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -639,7 +639,7 @@ static int createLibreOfficeKit(const bool sharePages,
                 std::chrono::microseconds(80000),
                 [&nFIFOWriter, &pipe, nFlags]
                 {
-                    return (nFIFOWriter = open(pipe.c_str(), nFlags)) > 0;
+                    return (nFIFOWriter = open(pipe.c_str(), nFlags)) >= 0;
                 });
 
             if (nFIFOWriter < 0)
commit d19433c3b8806a685e2f9e613e28a2978c890d0d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 12 13:31:32 2016 +0200

    Bin unused macros

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 41305d6..a8e70a4 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -45,9 +45,6 @@
 
 #define LIB_SOFFICEAPP  "lib" "sofficeapp" ".so"
 #define LIB_MERGED      "lib" "mergedlo" ".so"
-#define LIB_SCLO        "lib" "sclo" ".so"
-#define LIB_SWLO        "lib" "swlo" ".so"
-#define LIB_SDLO        "lib" "sdlo" ".so"
 #define JAILED_LOOLKIT_PATH    "/usr/bin/loolkit"
 
 typedef int (LokHookPreInit)  ( const char *install_path, const char *user_profile_path );