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

[Henry Castro]

 loolwsd/LOOLWSD.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 53aea60ab1acbd891a4dfc6e93b7c328f2101ee9
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Apr 12 08:32:22 2016 -0400

    loolwsd: fix -Werror,-Wshadow

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 5775146..ffbfeb2 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1408,7 +1408,7 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
     time_t last30SecCheck = time(NULL);
 
 #if ENABLE_DEBUG
-    time_t startTime = last30SecCheck;
+    time_t startTimeSpan = last30SecCheck;
 #endif
 
     int status = 0;
@@ -1497,9 +1497,9 @@ int LOOLWSD::main(const std::vector<std::string>& /*args*/)
             sleep(WSD_SLEEP_SECS);
         }
 #if ENABLE_DEBUG
-        if (careerSpanSeconds > 0 && time(nullptr) > startTime + careerSpanSeconds)
+        if (careerSpanSeconds > 0 && time(nullptr) > startTimeSpan + careerSpanSeconds)
         {
-            Log::info(std::to_string(time(nullptr) - startTime) + " seconds gone, finishing as requested.");
+            Log::info(std::to_string(time(nullptr) - startTimeSpan) + " seconds gone, finishing as requested.");
             break;
         }
 #endif