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

[Miklos Vajna]

 loolwsd/Admin.cpp                |    4 ++--
 loolwsd/MasterProcessSession.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ef8312357d7d3142190c68b7a39520a5a6a3385
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 7 09:09:32 2016 +0100

    loolwsd: fix -Werror,-Wshadow

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index ba1d154..2fa50ab 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -143,8 +143,8 @@ public:
                         else if (tokens.count() == 1 && tokens[0] == "documents")
                         {
 
-                            std::string response = "documents " + model.query("documents");
-                            ws->sendFrame(response.data(), response.size());
+                            std::string responseString = "documents " + model.query("documents");
+                            ws->sendFrame(responseString.data(), responseString.size());
                         }
                     }
                 }
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 55ccdaf..7f32192 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -452,10 +452,10 @@ bool MasterProcessSession::loadDocument(const char* /*buffer*/, int /*length*/,
     try
     {
         // Strip query params because we need unique URI (need a better solution!).
-        StringTokenizer tokens(_docURL, "?", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+        StringTokenizer urlTokens(_docURL, "?", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 
         // request new URL session
-        const std::string aMessage = "request " + getId() + " " + tokens[0] + "\r\n";
+        const std::string aMessage = "request " + getId() + " " + urlTokens[0] + "\r\n";
         Log::trace("MasterToBroker: " + aMessage.substr(0, aMessage.length()-2));
         Util::writeFIFO(LOOLWSD::BrokerWritePipe, aMessage);
     }