From 4ab1c43c1eee708fc50a4808f714a731891b75e8 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 30 Apr 2013 08:38:33 +0100 Subject: Tidy up keywords on module methods. - Remove virtual keyword from a ton of methods which don't need it. - Add override keyword to a ton of methods which do need it. --- src/modules/extra/m_ssl_openssl.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/modules/extra/m_ssl_openssl.cpp') diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 6063b792c..b8f588b06 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -134,7 +134,7 @@ class ModuleSSLOpenSSL : public Module SSL_CTX_set_verify(clictx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, OnVerify); } - void init() + void init() CXX11_OVERRIDE { // Needs the flag as it ignores a plain /rehash OnModuleRehash(NULL,"ssl"); @@ -143,7 +143,7 @@ class ModuleSSLOpenSSL : public Module ServerInstance->Modules->AddService(iohook); } - void OnHookIO(StreamSocket* user, ListenSocket* lsb) + void OnHookIO(StreamSocket* user, ListenSocket* lsb) CXX11_OVERRIDE { if (!user->GetIOHook() && lsb->bind_tag->getString("ssl") == "openssl") { @@ -152,7 +152,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnRehash(User* user) + void OnRehash(User* user) CXX11_OVERRIDE { sslports.clear(); @@ -191,7 +191,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnModuleRehash(User* user, const std::string ¶m) + void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE { if (param != "ssl") return; @@ -267,7 +267,7 @@ class ModuleSSLOpenSSL : public Module fclose(dhpfile); } - void On005Numeric(std::map& tokens) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { if (!sslports.empty()) tokens["SSL"] = sslports; @@ -280,7 +280,7 @@ class ModuleSSLOpenSSL : public Module delete[] sessions; } - void OnUserConnect(LocalUser* user) + void OnUserConnect(LocalUser* user) CXX11_OVERRIDE { if (user->eh.GetIOHook() == this) { @@ -295,7 +295,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnCleanup(int target_type, void* item) + void OnCleanup(int target_type, void* item) CXX11_OVERRIDE { if (target_type == TYPE_USER) { @@ -310,12 +310,12 @@ class ModuleSSLOpenSSL : public Module } } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides SSL support for clients", VF_VENDOR); } - void OnRequest(Request& request) + void OnRequest(Request& request) CXX11_OVERRIDE { if (strcmp("GET_SSL_CERT", request.id) == 0) { @@ -327,7 +327,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) + void OnStreamSocketAccept(StreamSocket* user, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { int fd = user->GetFd(); @@ -350,7 +350,7 @@ class ModuleSSLOpenSSL : public Module Handshake(user, session); } - void OnStreamSocketConnect(StreamSocket* user) + void OnStreamSocketConnect(StreamSocket* user) CXX11_OVERRIDE { int fd = user->GetFd(); /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ @@ -375,7 +375,7 @@ class ModuleSSLOpenSSL : public Module Handshake(user, session); } - void OnStreamSocketClose(StreamSocket* user) + void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE { int fd = user->GetFd(); /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ @@ -385,7 +385,7 @@ class ModuleSSLOpenSSL : public Module CloseSession(&sessions[fd]); } - int OnStreamSocketRead(StreamSocket* user, std::string& recvq) + int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE { int fd = user->GetFd(); /* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */ @@ -459,7 +459,7 @@ class ModuleSSLOpenSSL : public Module return 0; } - int OnStreamSocketWrite(StreamSocket* user, std::string& buffer) + int OnStreamSocketWrite(StreamSocket* user, std::string& buffer) CXX11_OVERRIDE { int fd = user->GetFd(); -- cgit v1.2.3