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

[Miklos Vajna]

 loolwsd/LOOLForKit.cpp |    6 +++---
 loolwsd/LOOLKit.cpp    |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3f0def0b02128b55a0b2c98ae0f50287307405dd
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Oct 7 10:20:13 2016 +0200

    Avoid 'auto' for getenv() result
    
    Which is sometimes stored in a bool, but when auto is used, it's char*,
    so it helps to have that written explicitly.
    
    Change-Id: I561692e8d5c575b4ff8612fd50e489ad3c60d655

diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 1fca1aa..32e7b93 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -200,9 +200,9 @@ int main(int argc, char** argv)
 
     // Initialization
     const bool logToFile = getenv("LOOL_LOGFILE");
-    const auto logFilename = getenv("LOOL_LOGFILENAME");
-    const auto logLevel = getenv("LOOL_LOGLEVEL");
-    const auto logColor = getenv("LOOL_LOGCOLOR");
+    const char* logFilename = getenv("LOOL_LOGFILENAME");
+    const char* logLevel = getenv("LOOL_LOGLEVEL");
+    const char* logColor = getenv("LOOL_LOGCOLOR");
     std::map<std::string, std::string> logProperties;
     if (logToFile && logFilename)
     {
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 632f407..675d126 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1358,9 +1358,9 @@ void lokit_main(const std::string& childRoot,
 {
     // Reinitialize logging when forked.
     const bool logToFile = getenv("LOOL_LOGFILE");
-    const auto logFilename = getenv("LOOL_LOGFILENAME");
-    const auto logLevel = getenv("LOOL_LOGLEVEL");
-    const auto logColor = getenv("LOOL_LOGCOLOR");
+    const char* logFilename = getenv("LOOL_LOGFILENAME");
+    const char* logLevel = getenv("LOOL_LOGLEVEL");
+    const char* logColor = getenv("LOOL_LOGCOLOR");
     std::map<std::string, std::string> logProperties;
     if (logToFile && logFilename)
     {