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

[Andras Timar]

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

New commits:
commit 345f1361457d107cdc04813b974cd2f66a79fad3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Mar 14 10:33:11 2016 +0100

    loolwsd: fix -Werror,-Wshadow

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index 5d77ebb..445af45 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -178,8 +178,8 @@ public:
                         else if (tokens[0] == "total_mem")
                         {
                             unsigned totalMem = _admin->getTotalMemoryUsage(model);
-                            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")
                         {
@@ -210,8 +210,8 @@ public:
                             oss << tokens[0] << " "
                                 << model.query(tokens[0]);
 
-                            std::string response = oss.str();
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = oss.str();
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "cpu_stats")
                         {
@@ -219,8 +219,8 @@ public:
                             oss << tokens[0] << " "
                                 << model.query(tokens[0]);
 
-                            std::string response = oss.str();
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = oss.str();
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "settings")
                         {
@@ -232,8 +232,8 @@ public:
                                 << "cpu_stats_size="  << model.query("cpu_stats_size") << " "
                                 << "cpu_stats_interval=" << std::to_string(_admin->getCpuStatsInterval());
 
-                            std::string response = oss.str();
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseFrame = oss.str();
+                            ws->sendFrame(responseFrame.data(), responseFrame.size());
                         }
                         else if (tokens[0] == "set" && tokens.count() > 1)
                         {