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

[Tor Lillqvist]

 loolwsd/LOOLWSD.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4b5561c9b4aa7605f15956fe5b91417bac3a261e
Author: Tor Lillqvist <t...@collabora.com>
Date:   Wed Oct 12 12:51:06 2016 +0300

    "" is the default value for the WebSocket::shutdown() statusMessage 
parameter
    
    So no need to pass it.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ec375ea..7151e22 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -203,7 +203,7 @@ void shutdownLimitReached(WebSocket& ws)
             if (--retries == 4)
             {
                 ws.sendFrame(error.data(), error.size());
-                ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
+                ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
             }
         }
         while (retries > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != 
WebSocket::FRAME_OP_CLOSE);
@@ -211,7 +211,7 @@ void shutdownLimitReached(WebSocket& ws)
     catch (Exception&)
     {
         ws.sendFrame(error.data(), error.size());
-        ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
+        ws.shutdown(WebSocket::WS_POLICY_VIOLATION);
     }
 }
 
@@ -896,7 +896,7 @@ private:
             // something wrong, with internal exceptions
             Log::trace("Abnormal close handshake.");
             session->closeFrame();
-            ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+            ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
             session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
         }
     }
@@ -1049,7 +1049,7 @@ public:
                         const std::string msg = std::string("error: ") + 
exc.what();
                         ws->sendFrame(msg.data(), msg.size());
                         // abnormal close frame handshake
-                        ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+                        ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
                     }
                     catch (const std::exception& exc2)
                     {
@@ -1274,7 +1274,7 @@ public:
                 // something wrong, with internal exceptions
                 Log::trace("Abnormal close handshake.");
                 session->closeFrame();
-                ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+                ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY);
                 session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
             }
         }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits