Fix clang style warnings in webrtc/base
Mostly this consists of marking functions with override when
applicable, and moving function bodies from .h to .cc files.
Not inlining virtual functions with simple bodies such as
{ return false; }
strikes me as probably losing more in readability than we gain in
binary size and compilation time, but I guess it's just like any other
case where enabling a generally good warning forces us to write
slightly worse code in a couple of places.
BUG=163
R=kjellander@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/47429004
Cr-Commit-Position: refs/heads/master@{#8656}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8656 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/base/firewallsocketserver.cc b/webrtc/base/firewallsocketserver.cc
index 31c18d9..c35a687 100644
--- a/webrtc/base/firewallsocketserver.cc
+++ b/webrtc/base/firewallsocketserver.cc
@@ -25,7 +25,7 @@
: AsyncSocketAdapter(socket), server_(server), type_(type) {
}
- virtual int Connect(const SocketAddress& addr) {
+ int Connect(const SocketAddress& addr) override {
if (type_ == SOCK_STREAM) {
if (!server_->Check(FP_TCP, GetLocalAddress(), addr)) {
LOG(LS_VERBOSE) << "FirewallSocket outbound TCP connection from "
@@ -38,10 +38,10 @@
}
return AsyncSocketAdapter::Connect(addr);
}
- virtual int Send(const void* pv, size_t cb) {
+ int Send(const void* pv, size_t cb) override {
return SendTo(pv, cb, GetRemoteAddress());
}
- virtual int SendTo(const void* pv, size_t cb, const SocketAddress& addr) {
+ int SendTo(const void* pv, size_t cb, const SocketAddress& addr) override {
if (type_ == SOCK_DGRAM) {
if (!server_->Check(FP_UDP, GetLocalAddress(), addr)) {
LOG(LS_VERBOSE) << "FirewallSocket outbound UDP packet from "
@@ -52,11 +52,11 @@
}
return AsyncSocketAdapter::SendTo(pv, cb, addr);
}
- virtual int Recv(void* pv, size_t cb) {
+ int Recv(void* pv, size_t cb) override {
SocketAddress addr;
return RecvFrom(pv, cb, &addr);
}
- virtual int RecvFrom(void* pv, size_t cb, SocketAddress* paddr) {
+ int RecvFrom(void* pv, size_t cb, SocketAddress* paddr) override {
if (type_ == SOCK_DGRAM) {
while (true) {
int res = AsyncSocketAdapter::RecvFrom(pv, cb, paddr);
@@ -72,7 +72,7 @@
return AsyncSocketAdapter::RecvFrom(pv, cb, paddr);
}
- virtual int Listen(int backlog) {
+ int Listen(int backlog) override {
if (!server_->tcp_listen_enabled()) {
LOG(LS_VERBOSE) << "FirewallSocket listen attempt denied";
return -1;
@@ -80,7 +80,7 @@
return AsyncSocketAdapter::Listen(backlog);
}
- virtual AsyncSocket* Accept(SocketAddress* paddr) {
+ AsyncSocket* Accept(SocketAddress* paddr) override {
SocketAddress addr;
while (AsyncSocket* sock = AsyncSocketAdapter::Accept(&addr)) {
if (server_->Check(FP_TCP, addr, GetLocalAddress())) {
@@ -190,6 +190,18 @@
return WrapSocket(server_->CreateAsyncSocket(family, type), type);
}
+void FirewallSocketServer::SetMessageQueue(MessageQueue* queue) {
+ server_->SetMessageQueue(queue);
+}
+
+bool FirewallSocketServer::Wait(int cms, bool process_io) {
+ return server_->Wait(cms, process_io);
+}
+
+void FirewallSocketServer::WakeUp() {
+ return server_->WakeUp();
+}
+
AsyncSocket* FirewallSocketServer::WrapSocket(AsyncSocket* sock, int type) {
if (!sock ||
(type == SOCK_STREAM && !tcp_sockets_enabled_) ||