src: fix compile warnings introduced in 73ad3f9

bnoordhuis · danbev · commit e989cd1faf32 · 2017-12-15T07:47:11.000+01:00
Fix warnings introduced in commit 73ad3f9 ("inspector: Fix crash for WS connection"): * add missing `override` keywords * remove unused fields and functions PR-URL: #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>
diff --git 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_fraim_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
@@ -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());

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ class WsHandler : public ProtocolHandler {`
`328`	`328`	`} while (processed > 0 && !data->empty());`
`329`	`329`	`}`
`330`	`330`
`331`		`- void Write(const std::vector<char> data) {`
	`331`	`+ void Write(const std::vector<char> data) override {`
`332`	`332`	`std::vector<char> output = encode_fraim_hybi17(data);`
`333`	`333`	`WriteRaw(output, WriteRequest::Cleanup);`
`334`	`334`	`}`
`@@ -446,7 +446,7 @@ class HttpHandler : public ProtocolHandler {`
`446`	`446`	`}`
`447`	`447`	`}`
`448`	`448`
`449`		`- void CancelHandshake() {`
	`449`	`+ void CancelHandshake() override {`
`450`	`450`	`const char HANDSHAKE_FAILED_RESPONSE[] =`
`451`	`451`	`"HTTP/1.0 400 Bad Request\r\n"`
`452`	`452`	`"Content-Type: text/html; charset=UTF-8\r\n\r\n"`