1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: fix compile warnings introduced in 73ad3f9bea

Browse Source 
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>
This commit is contained in:
Ben Noordhuis 2017-12-13 14:51:33 +01:00 committed by Daniel Bevenius
parent 246aeaca1e
commit e989cd1faf
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/inspector_socket.cc
View File

@ -328,7 +328,7 @@ class WsHandler : public ProtocolHandler {
} while (processed > 0 && !data->empty()); } 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); std::vector<char> output = encode_frame_hybi17(data);
WriteRaw(output, WriteRequest::Cleanup); WriteRaw(output, WriteRequest::Cleanup);
} }
@ -446,7 +446,7 @@ class HttpHandler : public ProtocolHandler {
} }
} }
void CancelHandshake() { void CancelHandshake() override {
const char HANDSHAKE_FAILED_RESPONSE[] = const char HANDSHAKE_FAILED_RESPONSE[] =
"HTTP/1.0 400 Bad Request\r\n" "HTTP/1.0 400 Bad Request\r\n"
"Content-Type: text/html; charset=UTF-8\r\n\r\n" "Content-Type: text/html; charset=UTF-8\r\n\r\n"

11
src/inspector_socket_server.cc
View File

@ -84,11 +84,6 @@ const char* MatchPathSegment(const char* path, const char* expected) {
return nullptr; 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, void PrintDebuggerReadyMessage(const std::string& host,
int port, int port,
const std::vector<std::string>& ids, const std::vector<std::string>& ids,
@ -235,7 +230,6 @@ class SocketSession {
private: private:
const int id_; const int id_;
InspectorSocket::Pointer ws_socket_; InspectorSocket::Pointer ws_socket_;
InspectorSocketServer* server_;
const int server_port_; const int server_port_;
std::string ws_key_; std::string ws_key_;
}; };
@ -531,10 +525,7 @@ void InspectorSocketServer::Send(int session_id, const std::string& message) {
// InspectorSession tracking // InspectorSession tracking
SocketSession::SocketSession(InspectorSocketServer* server, int id, SocketSession::SocketSession(InspectorSocketServer* server, int id,
int server_port) int server_port)
: id_(id), : id_(id), server_port_(server_port) {}
server_(server),
server_port_(server_port) { }
void SocketSession::Send(const std::string& message) { void SocketSession::Send(const std::string& message) {
ws_socket_->Write(message.data(), message.length()); ws_socket_->Write(message.data(), message.length());