[Libreoffice-commits] online.git: common/IoUtil.cpp common/Util.cpp test/httpwstest.cpp test/TileCacheTests.cpp test/TileQueueTests.cpp wsd/ClientSession.cpp wsd/FileServer.cpp

[Miklos Vajna]

 common/IoUtil.cpp       |    1 -
 common/Util.cpp         |    1 -
 test/TileCacheTests.cpp |    2 +-
 test/TileQueueTests.cpp |    1 -
 test/httpwstest.cpp     |    1 -
 wsd/ClientSession.cpp   |    1 -
 wsd/FileServer.cpp      |    1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit a3d6dee5030678baf141e91706d2e80a8f3af44f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 3 15:18:38 2017 +0100

    Remove unused strings
    
    Change-Id: I621c462bca38222dcf26dfa1e414cf27e1a3e088

diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index da9a4242..c93023af 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -113,7 +113,6 @@ void SocketProcessor(const std::shared_ptr<LOOLWebSocket>& ws,
 
             LOG_CHECK(n > 0);
 
-            const std::string firstLine = LOOLProtocol::getFirstLine(payload);
             if ((flags & WebSocket::FrameFlags::FRAME_FLAG_FIN) != WebSocket::FrameFlags::FRAME_FLAG_FIN)
             {
                 // One WS message split into multiple frames.
diff --git a/common/Util.cpp b/common/Util.cpp
index a3e5e798..9dd3c80c 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -164,7 +164,6 @@ namespace Util
             while (!isdigit(line[len]) && line[len] != '\0')
                 ++len;
 
-            const auto str = std::string(line + len, strlen(line + len) - 1);
             return line + len;
         }
 
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index cac39144..2231dfa9 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -381,7 +381,7 @@ void TileCacheTests::testDisconnectMultiView()
         }
 
         // Should never get more than 4 tiles on socket2.
-        const auto res2 = getResponseString(socket2, "tile:", "disconnectMultiView-2 ", 500);
+        getResponseString(socket2, "tile:", "disconnectMultiView-2 ", 500);
     }
 }
 
diff --git a/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
index 72f263eb..bcf38ba3 100644
--- a/test/TileQueueTests.cpp
+++ b/test/TileQueueTests.cpp
@@ -119,7 +119,6 @@ void TileQueueTests::testTileCombinedRendering()
     const std::string req1 = "tile part=0 width=256 height=256 tileposx=0 tileposy=0 tilewidth=3840 tileheight=3840";
     const std::string req2 = "tile part=0 width=256 height=256 tileposx=3840 tileposy=0 tilewidth=3840 tileheight=3840";
     const std::string req3 = "tile part=0 width=256 height=256 tileposx=0 tileposy=3840 tilewidth=3840 tileheight=3840";
-    const std::string req4 = "tile part=0 width=256 height=256 tileposx=3840 tileposy=3840 tilewidth=3840 tileheight=3840";
 
     const std::string resHor = "tilecombine part=0 width=256 height=256 tileposx=0,3840 tileposy=0,0 imgsize=0,0 tilewidth=3840 tileheight=3840 ver=-1,-1 oldwid=0,0 wid=0,0";
     const TileQueue::Payload payloadHor(resHor.data(), resHor.data() + resHor.size());
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 14a2fb24..dee2e160 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2375,7 +2375,6 @@ void HTTPWSTest::testEachView(const std::string& doc, const std::string& type,
                               const std::string& testname)
 {
     const std::string view = testname + "view %d -> ";
-    const std::string load = testname + "view %d, cannot load the document ";
     const std::string error = testname + "view %d, did not receive a %s message as expected";
 
     try
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index be9f542f..630c0f38 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -861,7 +861,6 @@ bool ClientSession::forwardToClient(const std::shared_ptr<Message>& payload)
 
 Authorization ClientSession::getAuthorization() const
 {
-    std::string accessToken;
     Poco::URI::QueryParameters queryParams = _uriPublic.getQueryParameters();
 
     // prefer the access_token
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f27d9272..949ad0f1 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -132,7 +132,6 @@ bool FileServerRequestHandler::isAdminLoggedIn(const HTTPRequest& request,
     if (credentials.getUsername() == user &&
         userProvidedPwd == pass)
     {
-        const std::string htmlMimeType = "text/html";
         // generate and set the cookie
         JWTAuth authAgent(sslKeyPath, "admin", "admin", "admin");
         const std::string jwtToken = authAgent.getAccessToken();