net/WebSocketHandler.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a4f19ac22988712859008e83ce3df161a48d89c2
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Sep 19 10:30:19 2018 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Sep 19 10:33:41 2018 +0300
Avoid double "0x" prefix for pointer values in log output
No need for explicit "0x" and std::hex when outputting a pointer. A
pointer will be output as a hex number anyway. We used to have things
like this in the log:
TRC #25 Connected to WS Handler 0x0x3610b60| ./net/WebSocketHandler.hpp:80
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 0bb0ddc1f..104c9b879 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -77,7 +77,7 @@ public:
void onConnect(const std::shared_ptr<StreamSocket>& socket) override
{
_socket = socket;
- LOG_TRC("#" << socket->getFD() << " Connected to WS Handler 0x" <<
std::hex << this << std::dec);
+ LOG_TRC("#" << socket->getFD() << " Connected to WS Handler " << this);
}
/// Status codes sent to peer on shutdown.
@@ -104,7 +104,7 @@ public:
std::shared_ptr<StreamSocket> socket = _socket.lock();
if (socket == nullptr)
{
- LOG_ERR("No socket associated with WebSocketHandler 0x" <<
std::hex << this << std::dec);
+ LOG_ERR("No socket associated with WebSocketHandler " << this);
return;
}
@@ -309,7 +309,7 @@ public:
std::shared_ptr<StreamSocket> socket = _socket.lock();
if (socket == nullptr)
{
- LOG_ERR("No socket associated with WebSocketHandler 0x" <<
std::hex << this << std::dec);
+ LOG_ERR("No socket associated with WebSocketHandler " << this);
}
else if (_isClient && !socket->isWebSocket())
handleClientUpgrade();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
