aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2017-12-13 14:51:33 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2017-12-15 07:47:11 +0100
commite989cd1faf32f0123d176a54b153219cc10e3bc7 (patch)
tree0c758b688a8aea8584a91944c306816d7cb741f2
parent246aeaca1ed47e245ee4c92084b59f5ddb31163c (diff)
downloadandroid-node-v8-e989cd1faf32f0123d176a54b153219cc10e3bc7.tar.gz
android-node-v8-e989cd1faf32f0123d176a54b153219cc10e3bc7.tar.bz2
android-node-v8-e989cd1faf32f0123d176a54b153219cc10e3bc7.zip
src: fix compile warnings introduced in 73ad3f9bea
Fix warnings introduced in commit 73ad3f9bea ("inspector: Fix crash for WS connection"): * add missing `override` keywords * remove unused fields and functions PR-URL: https://github.com/nodejs/node/pull/17649 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
-rw-r--r--src/inspector_socket.cc4
-rw-r--r--src/inspector_socket_server.cc11
2 files changed, 3 insertions, 12 deletions
diff --git a/src/inspector_socket.cc b/src/inspector_socket.cc
index 23b77f6aa5..386b4c3af0 100644
--- a/src/inspector_socket.cc
+++ b/src/inspector_socket.cc
@@ -328,7 +328,7 @@ class WsHandler : public ProtocolHandler {
} while (processed > 0 && !data->empty());
}
- void Write(const std::vector<char> data) {
+ void Write(const std::vector<char> data) override {
std::vector<char> output = encode_frame_hybi17(data);
WriteRaw(output, WriteRequest::Cleanup);
}
@@ -446,7 +446,7 @@ class HttpHandler : public ProtocolHandler {
}
}
- void CancelHandshake() {
+ void CancelHandshake() override {
const char HANDSHAKE_FAILED_RESPONSE[] =
"HTTP/1.0 400 Bad Request\r\n"
"Content-Type: text/html; charset=UTF-8\r\n\r\n"
diff --git a/src/inspector_socket_server.cc b/src/inspector_socket_server.cc
index bf114251cb..03e5c60e65 100644
--- a/src/inspector_socket_server.cc
+++ b/src/inspector_socket_server.cc
@@ -84,11 +84,6 @@ const char* MatchPathSegment(const char* path, const char* expected) {
return nullptr;
}
-void OnBufferAlloc(uv_handle_t* handle, size_t len, uv_buf_t* buf) {
- buf->base = new char[len];
- buf->len = len;
-}
-
void PrintDebuggerReadyMessage(const std::string& host,
int port,
const std::vector<std::string>& ids,
@@ -235,7 +230,6 @@ class SocketSession {
private:
const int id_;
InspectorSocket::Pointer ws_socket_;
- InspectorSocketServer* server_;
const int server_port_;
std::string ws_key_;
};
@@ -531,10 +525,7 @@ void InspectorSocketServer::Send(int session_id, const std::string& message) {
// InspectorSession tracking
SocketSession::SocketSession(InspectorSocketServer* server, int id,
int server_port)
- : id_(id),
- server_(server),
- server_port_(server_port) { }
-
+ : id_(id), server_port_(server_port) {}
void SocketSession::Send(const std::string& message) {
ws_socket_->Write(message.data(), message.length());