[Libreoffice-commits] online.git: tools/WebSocketDump.cpp wsd/Admin.cpp wsd/Admin.hpp

[Miklos Vajna (via logerrit)]

 tools/WebSocketDump.cpp |    4 ++--
 wsd/Admin.cpp           |    3 +--
 wsd/Admin.hpp           |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 797c996c566e549244919bb3a35101b1cae528fc
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Mar 6 09:38:09 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Mar 6 11:31:43 2020 +0100

    Fix -Werror,-Woverloaded-virtual warnings
    
    Probably these were just not adapted by accident in commit
    f70e627795b09522d61185ac38d6ecdced9aca23 (WebSocket - simplify
    handleMessage for now., 2020-03-05).
    
    Change-Id: I578d95d938c0c466e9547dcda3d2b297dc347a34
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90076
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/tools/WebSocketDump.cpp b/tools/WebSocketDump.cpp
index 5ea8f6da7..e2fe32e54 100644
--- a/tools/WebSocketDump.cpp
+++ b/tools/WebSocketDump.cpp
@@ -42,9 +42,9 @@ public:
 
 private:
     /// Process incoming websocket messages
-    void handleMessage(bool fin, WSOpCode code, std::vector<char> &data)
+    void handleMessage(const std::vector<char> &data) override
     {
-        std::cout << "WebSocket message code " << (int)code << " fin " << fin << " data:\n";
+        std::cout << "WebSocket message data:\n";
         Util::dumpHex(std::cout, "", "    ", data, false);
     }
 };
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index cfd39885c..ec16ee757 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -48,8 +48,7 @@ const int Admin::MinStatsIntervalMs = 50;
 const int Admin::DefStatsIntervalMs = 1000;
 
 /// Process incoming websocket messages
-void AdminSocketHandler::handleMessage(bool /* fin */, WSOpCode /* code */,
-                                       std::vector<char> &payload)
+void AdminSocketHandler::handleMessage(const std::vector<char> &payload)
 {
     // FIXME: check fin, code etc.
     const std::string firstLine = getFirstLine(payload.data(), payload.size());
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 2157def98..6a2a3c752 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -43,7 +43,7 @@ private:
     void sendTextFrame(const std::string& message);
 
     /// Process incoming websocket messages
-    void handleMessage(bool fin, WSOpCode code, std::vector<char> &data);
+    void handleMessage(const std::vector<char> &data) override;
 
 private:
     Admin* _admin;