From ba3dd9cedcca2f3cc6781f09410e3cf2cf696e43 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 10 Nov 2020 23:14:21 +0000 Subject: Convert FOREACH_MOD_CUSTOM to a variadic function. --- src/modules/m_cap.cpp | 6 +++--- src/modules/m_cgiirc.cpp | 2 +- src/modules/m_httpd_stats.cpp | 2 +- src/modules/m_ircv3_ctctags.cpp | 6 +++--- src/modules/m_ircv3_servertime.cpp | 4 +--- src/modules/m_sasl.cpp | 2 +- src/modules/m_services_account.cpp | 2 +- src/modules/m_spanningtree/away.cpp | 4 ++-- src/modules/m_spanningtree/commandbuilder.h | 4 ++-- src/modules/m_spanningtree/main.cpp | 2 +- src/modules/m_spanningtree/misccommands.cpp | 4 ++-- src/modules/m_spanningtree/netburst.cpp | 6 +++--- src/modules/m_spanningtree/treeserver.cpp | 6 +++--- 13 files changed, 24 insertions(+), 26 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index a7f914d5c..7a08f42c6 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -180,7 +180,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener caps.insert(std::make_pair(cap->GetName(), cap)); ServerInstance->Modules.AddReferent("cap/" + cap->GetName(), cap); - FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapAddDel, (cap, true)); + evprov.Call(&Cap::EventListener::OnCapAddDel, cap, true); } void DelCap(Cap::Capability* cap) override @@ -192,7 +192,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Unregistering cap %s", cap->GetName().c_str()); // Fire the event first so modules can still see who is using the cap which is being unregistered - FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapAddDel, (cap, false)); + evprov.Call(&Cap::EventListener::OnCapAddDel, cap, false); // Turn off the cap for all users const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); @@ -218,7 +218,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener void NotifyValueChange(Capability* cap) override { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "Cap %s changed value", cap->GetName().c_str()); - FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapValueChange, (cap)); + evprov.Call(&Cap::EventListener::OnCapValueChange, cap); } Protocol GetProtocol(LocalUser* user) const diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 5cc3d4ce6..553e5e427 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -193,7 +193,7 @@ class CommandWebIRC : public SplitCommand } // Inform modules about the WebIRC attempt. - FOREACH_MOD_CUSTOM(webircevprov, WebIRC::EventListener, OnWebIRCAuth, (user, (hasflags ? &flags : NULL))); + webircevprov.Call(&WebIRC::EventListener::OnWebIRCAuth, user, (hasflags ? &flags : nullptr)); // Set the IP address sent via WEBIRC. We ignore the hostname and lookup // instead do our own DNS lookups because of unreliable gateways. diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 2d38d96e1..618d5d58d 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -118,7 +118,7 @@ namespace Stats data << ""; ISupport::TokenMap tokens; - FOREACH_MOD_CUSTOM(*isevprov, ISupport::EventListener, OnBuildISupport, (tokens)); + isevprov->Call(&ISupport::EventListener::OnBuildISupport, tokens); for (ISupport::TokenMap::const_iterator it = tokens.begin(); it != tokens.end(); ++it) { data << "" << Sanitize(it->first) diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp index 168779aae..72897ce05 100644 --- a/src/modules/m_ircv3_ctctags.cpp +++ b/src/modules/m_ircv3_ctctags.cpp @@ -37,7 +37,7 @@ class CommandTagMsg : public Command if (modres == MOD_RES_DENY) { // Inform modules that a module blocked the TAGMSG. - FOREACH_MOD_CUSTOM(tagevprov, CTCTags::EventListener, OnUserTagMessageBlocked, (source, msgtarget, msgdetails)); + tagevprov.Call(&CTCTags::EventListener::OnUserTagMessageBlocked, source, msgtarget, msgdetails); return false; } @@ -49,7 +49,7 @@ class CommandTagMsg : public Command } // Inform modules that a TAGMSG is about to be sent. - FOREACH_MOD_CUSTOM(tagevprov, CTCTags::EventListener, OnUserTagMessage, (source, msgtarget, msgdetails)); + tagevprov.Call(&CTCTags::EventListener::OnUserTagMessage, source, msgtarget, msgdetails); return true; } @@ -61,7 +61,7 @@ class CommandTagMsg : public Command lsource->idle_lastmsg = ServerInstance->Time(); // Inform modules that a TAGMSG was sent. - FOREACH_MOD_CUSTOM(tagevprov, CTCTags::EventListener, OnUserPostTagMessage, (source, msgtarget, msgdetails)); + tagevprov.Call(&CTCTags::EventListener::OnUserPostTagMessage, source, msgtarget, msgdetails); return CmdResult::SUCCESS; } diff --git a/src/modules/m_ircv3_servertime.cpp b/src/modules/m_ircv3_servertime.cpp index ca2914a08..17aa90dc9 100644 --- a/src/modules/m_ircv3_servertime.cpp +++ b/src/modules/m_ircv3_servertime.cpp @@ -47,8 +47,6 @@ class ServerTimeTag } public: - using ServerProtocol::MessageEventListener::OnBuildMessage; - ServerTimeTag(Module* mod) : IRCv3::ServerTime::Manager(mod) , IRCv3::CapTag(mod, "server-time", "time") @@ -64,7 +62,7 @@ class ServerTimeTag return &lasttimestring; } - void OnBuildMessage(User* source, const char* command, ClientProtocol::TagMap& tags) override + void OnBuildUserMessage(User* source, const char* command, ClientProtocol::TagMap& tags) override { // Server protocol. RefreshTimeString(); diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index c3cf8151a..eb019e994 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -171,7 +171,7 @@ static void SendSASL(LocalUser* user, const std::string& agent, char mode, const if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params)) { - FOREACH_MOD_CUSTOM(*saslevprov, SASLEventListener, OnSASLAuth, (params)); + saslevprov->Call(&SASLEventListener::OnSASLAuth, params); } } diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 278786aef..750690219 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -138,7 +138,7 @@ class AccountExtItemImpl : public AccountExtItem } } - FOREACH_MOD_CUSTOM(eventprov, AccountEventListener, OnAccountChange, (user, value)); + eventprov.Call(&AccountEventListener::OnAccountChange, user, value); } }; diff --git a/src/modules/m_spanningtree/away.cpp b/src/modules/m_spanningtree/away.cpp index 9dc372761..2baa89431 100644 --- a/src/modules/m_spanningtree/away.cpp +++ b/src/modules/m_spanningtree/away.cpp @@ -39,13 +39,13 @@ CmdResult CommandAway::HandleRemote(::RemoteUser* u, Params& params) u->awaytime = ServerInstance->Time(); u->awaymsg = params.back(); - FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserAway, (u)); + awayevprov.Call(&Away::EventListener::OnUserAway, u); } else { u->awaytime = 0; u->awaymsg.clear(); - FOREACH_MOD_CUSTOM(awayevprov, Away::EventListener, OnUserBack, (u)); + awayevprov.Call(&Away::EventListener::OnUserBack, u); } return CmdResult::SUCCESS; } diff --git a/src/modules/m_spanningtree/commandbuilder.h b/src/modules/m_spanningtree/commandbuilder.h index 927213d74..e7ca61d7f 100644 --- a/src/modules/m_spanningtree/commandbuilder.h +++ b/src/modules/m_spanningtree/commandbuilder.h @@ -37,10 +37,10 @@ class CmdBuilder /** The size of tags within the contents. */ size_t tagsize = 0; - /** Fires the ServerProtocol::MessageEventListener::OnBuildMessage event for a server target. */ + /** Fires the ServerProtocol::MessageEventListener::OnBuildServerMessage event. */ void FireEvent(Server* target, const char* cmd, ClientProtocol::TagMap& taglist); - /** Fires the ServerProtocol::MessageEventListener::OnBuildMessage event for a user target. */ + /** Fires the ServerProtocol::MessageEventListener::OnBuildUserMessage. */ void FireEvent(User* target, const char* cmd, ClientProtocol::TagMap& taglist); /** Updates the tag string within the buffer. */ diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index b69f92444..f2ca7f6be 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -691,7 +691,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod) { TreeServer* server = i->second; if (!server->IsRoot()) - FOREACH_MOD_CUSTOM(GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (server, false)); + GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerSplit, server, false); } return; } diff --git a/src/modules/m_spanningtree/misccommands.cpp b/src/modules/m_spanningtree/misccommands.cpp index dd947f1f0..abf4b792b 100644 --- a/src/modules/m_spanningtree/misccommands.cpp +++ b/src/modules/m_spanningtree/misccommands.cpp @@ -26,13 +26,13 @@ void CmdBuilder::FireEvent(Server* target, const char* cmd, ClientProtocol::TagMap& taglist) { - FOREACH_MOD_CUSTOM(Utils->Creator->GetMessageEventProvider(), ServerProtocol::MessageEventListener, OnBuildMessage, (target, cmd, taglist)); + Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildServerMessage, target, cmd, taglist); UpdateTags(); } void CmdBuilder::FireEvent(User* target, const char* cmd, ClientProtocol::TagMap& taglist) { - FOREACH_MOD_CUSTOM(Utils->Creator->GetMessageEventProvider(), ServerProtocol::MessageEventListener, OnBuildMessage, (target, cmd, taglist)); + Utils->Creator->GetMessageEventProvider().Call(&ServerProtocol::MessageEventListener::OnBuildUserMessage, target, cmd, taglist); UpdateTags(); } diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index 8d78a8170..1199a3bb8 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -126,7 +126,7 @@ void TreeSocket::DoBurst(TreeServer* s) // Send all xlines this->SendXLines(); - FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncNetwork, (bs.server)); + Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncNetwork, bs.server); this->WriteLine(CmdBuilder("ENDBURST")); ServerInstance->SNO.WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002."); } @@ -266,7 +266,7 @@ void TreeSocket::SyncChannel(Channel* chan, BurstState& bs) this->WriteLine(CommandMetadata::Builder(chan, item->name, value)); } - FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncChannel, (chan, bs.server)); + Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncChannel, chan, bs.server); } void TreeSocket::SyncChannel(Channel* chan) @@ -302,6 +302,6 @@ void TreeSocket::SendUsers(BurstState& bs) this->WriteLine(CommandMetadata::Builder(user, item->name, value)); } - FOREACH_MOD_CUSTOM(Utils->Creator->GetSyncEventProvider(), ServerProtocol::SyncEventListener, OnSyncUser, (user, bs.server)); + Utils->Creator->GetSyncEventProvider().Call(&ServerProtocol::SyncEventListener::OnSyncUser, user, bs.server); } } diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 479ed00b8..72a0d4d29 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -126,7 +126,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s this->AddHashEntry(); Parent->Children.push_back(this); - FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerLink, (this)); + Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerLink, this); } void TreeServer::BeginBurst(uint64_t startms) @@ -163,7 +163,7 @@ void TreeServer::FinishBurst() unsigned long bursttime = ts - this->StartBurst; ServerInstance->SNO.WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)", GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); - FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerBurst, (this)); + Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerBurst, this); StartBurst = 0; FinishBurstInternal(); @@ -217,7 +217,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error) RemoveHash(); if (!Utils->Creator->dying) - FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (this, error)); + Utils->Creator->GetLinkEventProvider().Call(&ServerProtocol::LinkEventListener::OnServerSplit, this, error); } unsigned int TreeServer::QuitUsers(const std::string& reason) -- cgit v1.3.1-10-gc9f91