diff options
Diffstat (limited to 'src/modules')
45 files changed, 91 insertions, 106 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index e39e171a6..da045868d 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -156,7 +156,7 @@ class ModuleGeoMaxMind : public Module memset(&geoapi.mmdb, 0, sizeof(geoapi.mmdb)); } - ~ModuleGeoMaxMind() + ~ModuleGeoMaxMind() override { MMDB_close(&geoapi.mmdb); } diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 09c9a3f6e..bfb1397cb 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -294,7 +294,7 @@ class LDAPService : public LDAPProvider, public SocketThread Connect(); } - ~LDAPService() + ~LDAPService() override { this->LockQueue(); @@ -623,7 +623,7 @@ class ModuleLDAP : public Module { } - ~ModuleLDAP() + ~ModuleLDAP() override { for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i) { diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 446bf730b..728f5a04a 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -140,7 +140,7 @@ class ModuleSQL : public Module void init() override; ModuleSQL(); - ~ModuleSQL(); + ~ModuleSQL() override; void ReadConfig(ConfigStatus& status) override; void OnUnloadModule(Module* mod) override; }; @@ -305,7 +305,7 @@ class SQLConnection : public SQL::Provider { } - ~SQLConnection() + ~SQLConnection() override { mysql_close(connection); } diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 368e5e363..baa22b999 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -207,7 +207,7 @@ class SQLConn : public SQL::Provider, public EventHandler return this->EventHandler::Cull(); } - ~SQLConn() + ~SQLConn() override { SQL::Error err(SQL::BAD_DBID); if (qinprog.c) @@ -532,7 +532,7 @@ class ModulePgSQL : public Module { } - ~ModulePgSQL() + ~ModulePgSQL() override { delete retimer; ClearAllConnections(); diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index 4d51be31b..fca30b4bf 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -63,7 +63,7 @@ class PCREPattern final throw Regex::Exception(pattern, error, erroroffset); } - ~PCREPattern() + ~PCREPattern() override { pcre_free(regex); } diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp index 943f7cca4..be3c28093 100644 --- a/src/modules/extra/m_regex_posix.cpp +++ b/src/modules/extra/m_regex_posix.cpp @@ -57,7 +57,7 @@ class POSIXPattern final throw Regex::Exception(pattern, std::string(&errormsg[0], errormsg.size())); } - ~POSIXPattern() + ~POSIXPattern() override { regfree(®ex); } diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index a0c901230..2285adaa6 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -64,7 +64,7 @@ class TREPattern final throw Regex::Exception(pattern, std::string(&errormsg[0], errormsg.size())); } - ~TREPattern() + ~TREPattern() override { regfree(®ex); } diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 3cd9713cb..2f3954a84 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -113,7 +113,7 @@ class SQLConn : public SQL::Provider } } - ~SQLConn() + ~SQLConn() override { if (conn) { @@ -237,7 +237,7 @@ class ModuleSQLite3 : public Module { } - ~ModuleSQLite3() + ~ModuleSQLite3() override { ClearConns(); } diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 5557a3806..d4f33d819 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1086,7 +1086,7 @@ class GnuTLSIOHookProvider : public SSLIOHookProvider ServerInstance->Modules.AddService(*this); } - ~GnuTLSIOHookProvider() + ~GnuTLSIOHookProvider() override { ServerInstance->Modules.DelService(*this); } @@ -1199,7 +1199,7 @@ class ModuleSSLGnuTLS : public Module } } - ~ModuleSSLGnuTLS() + ~ModuleSSLGnuTLS() override { ServerInstance->GenRandom = &InspIRCd::DefaultGenRandom; } diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 5282ee261..dd14ec080 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -818,7 +818,7 @@ class mbedTLSIOHookProvider : public SSLIOHookProvider ServerInstance->Modules.AddService(*this); } - ~mbedTLSIOHookProvider() + ~mbedTLSIOHookProvider() override { ServerInstance->Modules.DelService(*this); } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index d7e5e3782..2a0479e3e 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -869,7 +869,7 @@ class OpenSSLIOHookProvider : public SSLIOHookProvider ServerInstance->Modules.AddService(*this); } - ~OpenSSLIOHookProvider() + ~OpenSSLIOHookProvider() override { ServerInstance->Modules.DelService(*this); } @@ -952,7 +952,7 @@ class ModuleSSLOpenSSL : public Module biomethods = OpenSSL::BIOMethod::alloc(); } - ~ModuleSSLOpenSSL() + ~ModuleSSLOpenSSL() override { BIO_meth_free(biomethods); } diff --git a/src/modules/extra/m_sslrehashsignal.cpp b/src/modules/extra/m_sslrehashsignal.cpp index c50ea10f2..b911c6a43 100644 --- a/src/modules/extra/m_sslrehashsignal.cpp +++ b/src/modules/extra/m_sslrehashsignal.cpp @@ -36,7 +36,7 @@ class ModuleSSLRehashSignal : public Module { } - ~ModuleSSLRehashSignal() + ~ModuleSSLRehashSignal() override { signal(SIGUSR1, SIG_IGN); } diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index 7c7dc8844..645b2b916 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -142,10 +142,6 @@ class AntiCapsMode : public ParamMode<AntiCapsMode, SimpleExtItem<AntiCapsSettin case ACM_KICK_BAN: out.append("kickban"); break; - default: - out.append("unknown~"); - out.append(ConvToStr(acs->method)); - break; } out.push_back(':'); out.append(ConvToStr(acs->minlen)); diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp index a47ce8f36..9f3c9f7d5 100644 --- a/src/modules/m_bcrypt.cpp +++ b/src/modules/m_bcrypt.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -Ivendor_directory("bcrypt") +/// $CompilerFlags: -isystem vendor_directory("bcrypt") #include "inspircd.h" diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 4a01b569c..887c8b337 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -423,7 +423,7 @@ public: time_t now = ServerInstance->Time(); /* +g and *not* accepted */ user->WriteNumeric(ERR_TARGUMODEG, dest->nick, "is in +g mode (server-side ignore)."); - if (now > (dat->lastnotify + (time_t)notify_cooldown)) + if (now > (dat->lastnotify + notify_cooldown)) { user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them."); dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +g set. Use /ACCEPT +%s to allow.", diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index e368145b8..fd1cc2127 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -158,7 +158,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener managerimpl = this; } - ~ManagerImpl() + ~ManagerImpl() override { for (CapMap::iterator i = caps.begin(); i != caps.end(); ++i) { diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 8ca02402b..70c01109d 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -180,7 +180,7 @@ class ModuleCBan : public Module, public Stats::EventListener ServerInstance->XLines->RegisterFactory(&f); } - ~ModuleCBan() + ~ModuleCBan() override { ServerInstance->XLines->DelAll("CBAN"); ServerInstance->XLines->UnregisterFactory(&f); diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 2000f1c40..79fa98faa 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -494,8 +494,8 @@ class ModuleCloaking : public Module break; } case MODE_OPAQUE: - default: chost = SegmentIP(info, ip, true); + break; } return chost; } diff --git a/src/modules/m_codepage.cpp b/src/modules/m_codepage.cpp index 69bd6c1ad..4884da5d6 100644 --- a/src/modules/m_codepage.cpp +++ b/src/modules/m_codepage.cpp @@ -124,7 +124,7 @@ class ModuleCodepage { } - ~ModuleCodepage() + ~ModuleCodepage() override { ServerInstance->IsNick = origisnick; CheckInvalidNick(); diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index 5cfb0fe3f..aa71fd3c1 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -103,7 +103,7 @@ class ModuleCustomPrefix : public Module } } - ~ModuleCustomPrefix() + ~ModuleCustomPrefix() override { stdalgo::delete_all(modes); } diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index fc1465f7a..1857465af 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -234,7 +234,6 @@ class DNSBLResolver : public DNS::Request break; } case DNSBLConfEntry::I_UNKNOWN: - default: break; } diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index 37146e03c..b44a825fb 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -40,12 +40,12 @@ class ExemptChanOps : public ListModeBase syntax = "<restriction>:<prefix>"; } - static PrefixMode* FindMode(const std::string& mode) + static PrefixMode* FindMode(const std::string& pmode) { - if (mode.length() == 1) - return ServerInstance->Modes.FindPrefixMode(mode[0]); + if (pmode.length() == 1) + return ServerInstance->Modes.FindPrefixMode(pmode[0]); - ModeHandler* mh = ServerInstance->Modes.FindMode(mode, MODETYPE_CHANNEL); + ModeHandler* mh = ServerInstance->Modes.FindMode(pmode, MODETYPE_CHANNEL); return mh ? mh->IsPrefixMode() : NULL; } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index e2cfb13ed..cc9f2a211 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -128,7 +128,6 @@ class FilterResult break; default: return *n; - break; } } return 0; diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp index 3f8e5bc12..afcafbcce 100644 --- a/src/modules/m_hidelist.cpp +++ b/src/modules/m_hidelist.cpp @@ -86,7 +86,7 @@ class ModuleHideList : public Module { } - ~ModuleHideList() + ~ModuleHideList() override { stdalgo::delete_all(watchers); } diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 9a2006035..168f0bdca 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -26,7 +26,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -Ivendor_directory("http_parser") +/// $CompilerFlags: -isystem vendor_directory("http_parser") #include "inspircd.h" @@ -225,7 +225,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru ServerInstance->Timers.AddTimer(this); } - ~HttpServerSocket() + ~HttpServerSocket() override { sockets.erase(this); } diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index c18c8c960..41e592f7f 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -320,17 +320,14 @@ namespace Stats bool operator()(User* u1, User* u2) { - switch (order) { + switch (order) + { case OB_LASTMSG: return Compare(IS_LOCAL(u1)->idle_lastmsg, IS_LOCAL(u2)->idle_lastmsg); - break; case OB_NICK: return Compare(u1->nick, u2->nick); - break; - default: case OB_NONE: return false; - break; } } }; diff --git a/src/modules/m_ircv3_sts.cpp b/src/modules/m_ircv3_sts.cpp index ef1586208..4ee85bf73 100644 --- a/src/modules/m_ircv3_sts.cpp +++ b/src/modules/m_ircv3_sts.cpp @@ -74,7 +74,7 @@ class STSCap : public Cap::Capability DisableAutoRegister(); } - ~STSCap() + ~STSCap() override { // TODO: Send duration=0 when STS vanishes. } diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index 539465b42..a57ae26fd 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -311,7 +311,7 @@ class ModuleNationalChars : public Module } } - ~ModuleNationalChars() + ~ModuleNationalChars() override { ServerInstance->IsNick = rememberer; national_case_insensitive_map = lowermap_rememberer; diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp index 6804ba89d..ddaa7a8e3 100644 --- a/src/modules/m_pbkdf2.cpp +++ b/src/modules/m_pbkdf2.cpp @@ -207,7 +207,7 @@ class ModulePBKDF2 : public Module { } - ~ModulePBKDF2() + ~ModulePBKDF2() override { stdalgo::delete_all(providers); } diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 80a597846..fe9bd7e48 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -232,7 +232,7 @@ class ModuleRLine ServerInstance->XLines->RegisterFactory(&f); } - ~ModuleRLine() + ~ModuleRLine() override { ServerInstance->XLines->DelAll("R"); ServerInstance->XLines->UnregisterFactory(&f); diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 095a42fe7..b7318c86d 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -231,43 +231,41 @@ class SaslAuthenticator { switch (this->state) { - case SASL_INIT: - this->agent = msg[0]; - this->state = SASL_COMM; - /* fall through */ - case SASL_COMM: - if (msg[0] != this->agent) - return this->state; + case SASL_INIT: + this->agent = msg[0]; + this->state = SASL_COMM; + [[fallthrough]]; - if (msg.size() < 4) - return this->state; + case SASL_COMM: + if (msg[0] != this->agent) + return this->state; - if (msg[2] == "C") - { - ClientProtocol::Message authmsg("AUTHENTICATE"); - authmsg.PushParamRef(msg[3]); + if (msg.size() < 4) + return this->state; - ClientProtocol::Event authevent(*g_protoev, authmsg); - LocalUser* const localuser = IS_LOCAL(user); - if (localuser) - localuser->Send(authevent); - } - else if (msg[2] == "D") - { - this->state = SASL_DONE; - this->result = this->GetSaslResult(msg[3]); - } - else if (msg[2] == "M") - this->user->WriteNumeric(RPL_SASLMECHS, msg[3], "are available SASL mechanisms"); - else - ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str()); + if (msg[2] == "C") + { + ClientProtocol::Message authmsg("AUTHENTICATE"); + authmsg.PushParamRef(msg[3]); - break; - case SASL_DONE: - break; - default: - ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "WTF: SaslState is not a known state (%d)", this->state); - break; + ClientProtocol::Event authevent(*g_protoev, authmsg); + LocalUser* const localuser = IS_LOCAL(user); + if (localuser) + localuser->Send(authevent); + } + else if (msg[2] == "D") + { + this->state = SASL_DONE; + this->result = this->GetSaslResult(msg[3]); + } + else if (msg[2] == "M") + this->user->WriteNumeric(RPL_SASLMECHS, msg[3], "are available SASL mechanisms"); + else + ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str()); + break; + + case SASL_DONE: + break; } return this->state; @@ -306,8 +304,6 @@ class SaslAuthenticator case SASL_FAIL: this->user->WriteNumeric(ERR_SASLFAIL, "SASL authentication failed"); break; - default: - break; } this->state_announced = true; diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index db15f8c26..cdef9ec04 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -264,7 +264,6 @@ class ModuleServicesAccount // User is messaging a +M channel and is not registered or exempt. user->WriteNumeric(ERR_NEEDREGGEDNICK, targchan->name, "You need to be identified to a registered account to message this channel"); return MOD_RES_DENY; - break; } case MessageTarget::TYPE_USER: { @@ -278,7 +277,6 @@ class ModuleServicesAccount // User is messaging a +R user and is not registered or on an accept list. user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user"); return MOD_RES_DENY; - break; } case MessageTarget::TYPE_SERVER: break; diff --git a/src/modules/m_sha2.cpp b/src/modules/m_sha2.cpp index 3c3560d5c..e3ad8a6f7 100644 --- a/src/modules/m_sha2.cpp +++ b/src/modules/m_sha2.cpp @@ -23,7 +23,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -Ivendor_directory("sha2") +/// $CompilerFlags: -isystem vendor_directory("sha2") #include "inspircd.h" @@ -43,7 +43,7 @@ class HashSHA2 : public HashProvider std::string GenerateRaw(const std::string& data) override { std::vector<char> bytes(out_size); - SHA((unsigned char*)data.data(), data.size(), (unsigned char*)&bytes[0]); + SHA(reinterpret_cast<const unsigned char*>(data.data()), data.size(), reinterpret_cast<unsigned char*>(&bytes[0])); return std::string(&bytes[0], bytes.size()); } }; diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp index 3c9973853..d8e8ef827 100644 --- a/src/modules/m_showfile.cpp +++ b/src/modules/m_showfile.cpp @@ -171,7 +171,7 @@ class ModuleShowFile : public Module cmds.swap(newcmds); } - ~ModuleShowFile() + ~ModuleShowFile() override { stdalgo::delete_all(cmds); } diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 6ff15645d..404ddbb43 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -185,7 +185,7 @@ class ModuleShun : public Module, public Stats::EventListener ServerInstance->XLines->RegisterFactory(&shun); } - ~ModuleShun() + ~ModuleShun() override { ServerInstance->XLines->DelAll("SHUN"); ServerInstance->XLines->UnregisterFactory(&shun); diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 234776d7c..152ee25d7 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -102,9 +102,9 @@ class CommandMetadata : public ServerCommand class Builder : public CmdBuilder { public: - Builder(User* user, const std::string& key, const std::string& val); - Builder(Channel* chan, const std::string& key, const std::string& val); - Builder(Membership* memb, const std::string& key, const std::string& val); + Builder(const User* user, const std::string& key, const std::string& val); + Builder(const Channel* chan, const std::string& key, const std::string& val); + Builder(const Membership* memb, const std::string& key, const std::string& val); Builder(const std::string& key, const std::string& val); }; }; diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 0d4c32d72..7b1f8ef5b 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -220,6 +220,6 @@ class ModuleSpanningTree void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) override; void OnShutdown(const std::string& reason) override; Cullable::Result Cull() override; - ~ModuleSpanningTree(); + ~ModuleSpanningTree() override; void Prioritize() override; }; diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp index f250861f1..aabd4cbbc 100644 --- a/src/modules/m_spanningtree/metadata.cpp +++ b/src/modules/m_spanningtree/metadata.cpp @@ -110,7 +110,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params) return CmdResult::SUCCESS; } -CommandMetadata::Builder::Builder(User* user, const std::string& key, const std::string& val) +CommandMetadata::Builder::Builder(const User* user, const std::string& key, const std::string& val) : CmdBuilder("METADATA") { push(user->uuid); @@ -118,7 +118,7 @@ CommandMetadata::Builder::Builder(User* user, const std::string& key, const std: push_last(val); } -CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const std::string& val) +CommandMetadata::Builder::Builder(const Channel* chan, const std::string& key, const std::string& val) : CmdBuilder("METADATA") { push(chan->name); @@ -127,7 +127,7 @@ CommandMetadata::Builder::Builder(Channel* chan, const std::string& key, const s push_last(val); } -CommandMetadata::Builder::Builder(Membership* memb, const std::string& key, const std::string& val) +CommandMetadata::Builder::Builder(const Membership* memb, const std::string& key, const std::string& val) : CmdBuilder("METADATA") { push_raw("@"); diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp index 59a282378..8e0d0fd4d 100644 --- a/src/modules/m_spanningtree/protocolinterface.cpp +++ b/src/modules/m_spanningtree/protocolinterface.cpp @@ -87,17 +87,17 @@ void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server); } -void SpanningTreeProtocolInterface::SendMetaData(User* u, const std::string& key, const std::string& data) +void SpanningTreeProtocolInterface::SendMetaData(const User* u, const std::string& key, const std::string& data) { CommandMetadata::Builder(u, key, data).Broadcast(); } -void SpanningTreeProtocolInterface::SendMetaData(Channel* c, const std::string& key, const std::string& data) +void SpanningTreeProtocolInterface::SendMetaData(const Channel* c, const std::string& key, const std::string& data) { CommandMetadata::Builder(c, key, data).Broadcast(); } -void SpanningTreeProtocolInterface::SendMetaData(Membership* m, const std::string& key, const std::string& data) +void SpanningTreeProtocolInterface::SendMetaData(const Membership* m, const std::string& key, const std::string& data) { CommandMetadata::Builder(m, key, data).Broadcast(); } diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h index b44599db0..e4cda3c84 100644 --- a/src/modules/m_spanningtree/protocolinterface.h +++ b/src/modules/m_spanningtree/protocolinterface.h @@ -37,9 +37,9 @@ class SpanningTreeProtocolInterface : public ProtocolInterface bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const CommandBase::Params& params, User* source) override; void BroadcastEncap(const std::string& cmd, const CommandBase::Params& params, User* source, User* omit) override; - void SendMetaData(User* user, const std::string& key, const std::string& data) override; - void SendMetaData(Channel* chan, const std::string& key, const std::string& data) override; - void SendMetaData(Membership* memb, const std::string& key, const std::string& data) override; + void SendMetaData(const User* user, const std::string& key, const std::string& data) override; + void SendMetaData(const Channel* chan, const std::string& key, const std::string& data) override; + void SendMetaData(const Membership* memb, const std::string& key, const std::string& data) override; void SendMetaData(const std::string& key, const std::string& data) override; void SendSNONotice(char snomask, const std::string& text) override; void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype) override; diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h index 028bbf49d..8b09f3817 100644 --- a/src/modules/m_spanningtree/treeserver.h +++ b/src/modules/m_spanningtree/treeserver.h @@ -234,7 +234,7 @@ class TreeServer : public Server /** Destructor, deletes ServerUser unless IsRoot() */ - ~TreeServer(); + ~TreeServer() override; /** Returns the TreeServer the given user is connected to * @param user The user whose server to return diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index 2782330d5..daca8417b 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -123,7 +123,7 @@ class SpanningTreeUtilities : public Cullable /** Destroy class and free listeners etc */ - ~SpanningTreeUtilities(); + ~SpanningTreeUtilities() override; void RouteCommand(TreeServer* origin, CommandBase* cmd, const CommandBase::Params& parameters, User* user); diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp index f037336ff..7ff0b1759 100644 --- a/src/modules/m_sqloper.cpp +++ b/src/modules/m_sqloper.cpp @@ -195,7 +195,7 @@ public: GetOperBlocks(); } - ~ModuleSQLOper() + ~ModuleSQLOper() override { // Remove all oper blocks that were from the DB for (std::vector<std::string>::const_iterator i = my_blocks.begin(); i != my_blocks.end(); ++i) diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 4b60e5110..e7b7027db 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -223,7 +223,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - ~ModuleSVSHold() + ~ModuleSVSHold() override { ServerInstance->XLines->DelAll("SVSHOLD"); ServerInstance->XLines->UnregisterFactory(&s); diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index bd9ce068b..9bbf6ffa0 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/// $CompilerFlags: -Ivendor_directory("utfcpp") +/// $CompilerFlags: -isystem vendor_directory("utfcpp") #include "inspircd.h" |