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

Miklos Vajna vmiklos at collabora.co.uk
Thu Mar 10 16:17:52 UTC 2016


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

New commits:
commit f6cae2ee2ce5219f2f18ef0c7f56fff1a0bd38be
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 10 17:17:32 2016 +0100

    loolwsd: fix -Werror,-Wshadow

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index 3649df6..fd62ea1 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -173,18 +173,18 @@ public:
                             totalMem += model.getTotalMemoryUsage();
                             totalMem += Util::getMemoryUsage(Poco::Process::id());
 
-                            std::string response = "total_mem " + std::to_string(totalMem);
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = "total_mem " + std::to_string(totalMem);
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "active_users_count")
                         {
-                            std::string response = tokens[0] + " " + model.query(tokens[0]);
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = tokens[0] + " " + model.query(tokens[0]);
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "active_docs_count")
                         {
-                            std::string response = tokens[0] + " " + model.query(tokens[0]);
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = tokens[0] + " " + model.query(tokens[0]);
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "kill" && tokens.count() == 2)
                         {


More information about the Libreoffice-commits mailing list