From 37b3535543b81c3d75c8f62b83d422f0d2fbced0 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 27 May 2013 19:36:37 -0400 Subject: Initially attach all modules to all events, and detach them as the events are run if they are not implemented per module --- modules/protocol/bahamut.cpp | 1 - modules/protocol/charybdis.cpp | 6 ++---- modules/protocol/hybrid.cpp | 1 - modules/protocol/inspircd12.cpp | 4 +--- modules/protocol/inspircd20.cpp | 4 +--- modules/protocol/ngircd.cpp | 2 -- modules/protocol/plexus.cpp | 2 +- modules/protocol/unreal.cpp | 4 +--- 8 files changed, 6 insertions(+), 18 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index ecea98329..d65c24d65 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -554,7 +554,6 @@ class ProtoBahamut : public Module this->AddModes(); - ModuleManager::Attach(I_OnUserNickChange, this); } void OnUserNickChange(User *u, const Anope::string &) anope_override diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp index 368c79eac..9b87f3230 100644 --- a/modules/protocol/charybdis.cpp +++ b/modules/protocol/charybdis.cpp @@ -171,7 +171,7 @@ struct IRCDMessageEncap : IRCDMessage if (params[1] == "CERTFP") { u->fingerprint = params[2]; - FOREACH_MOD(I_OnFingerprint, OnFingerprint(u)); + FOREACH_MOD(OnFingerprint, (u)); } /* * Received: :42X ENCAP * SASL 42XAAAAAH * S PLAIN @@ -257,7 +257,7 @@ struct IRCDMessageEncap : IRCDMessage return; IdentifyRequest *req = new CharybdisSASLIdentifyRequest(this->owner, source, params[2], acc, pass); - FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(NULL, req)); + FOREACH_MOD(OnCheckAuthentication, (NULL, req)); req->Dispatch(); } } @@ -419,8 +419,6 @@ class ProtoCharybdis : public Module { - Implementation i[] = { I_OnReload, I_OnChannelSync, I_OnMLock, I_OnUnMLock }; - ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); if (ModuleManager::LoadModule("ratbox", User::Find(creator)) != MOD_ERR_OK) throw ModuleException("Unable to load ratbox"); diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 4649f3cf6..ecdaff456 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -610,7 +610,6 @@ public: { this->AddModes(); - ModuleManager::Attach(I_OnUserNickChange, this); if (Me->GetSID() == Me->GetName()) Me->SetSID(Servers::TS6_SID_Retrieve()); diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index f4a29bc50..cc1c5eb4c 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -953,7 +953,7 @@ struct IRCDMessageMetadata : IRCDMessage if ((pos2 - pos1) >= 32) // inspircd supports md5 and sha1 fingerprint hashes -> size 32 or 40 bytes. { u->fingerprint = data.substr(pos1, pos2 - pos1); - FOREACH_MOD(I_OnFingerprint, OnFingerprint(u)); + FOREACH_MOD(OnFingerprint, (u)); } } } @@ -1213,8 +1213,6 @@ class ProtoInspIRCd : public Module message_setident(this), message_server(this), message_time(this), message_uid(this) { - Implementation i[] = { I_OnUserNickChange }; - ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); Servers::Capab.insert("NOQUIT"); diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 2d7b4ef29..673836d93 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -699,7 +699,7 @@ struct IRCDMessageEncap : IRCDMessage return; IdentifyRequest *req = new InspIRCDSASLIdentifyRequest(this->owner, params[2], acc, pass); - FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(NULL, req)); + FOREACH_MOD(OnCheckAuthentication, (NULL, req)); req->Dispatch(); } } @@ -790,8 +790,6 @@ class ProtoInspIRCd : public Module throw ModuleException("No protocol interface for insp12"); ModuleManager::DetachAll(m_insp12); - Implementation i[] = { I_OnReload, I_OnUserNickChange, I_OnChannelSync, I_OnChanRegistered, I_OnDelChan, I_OnMLock, I_OnUnMLock, I_OnSetChannelOption }; - ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } ~ProtoInspIRCd() diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp index 139c7e5c4..a8ddeed30 100644 --- a/modules/protocol/ngircd.cpp +++ b/modules/protocol/ngircd.cpp @@ -656,8 +656,6 @@ class ProtongIRCd : public Module this->AddModes(); - Implementation i[] = { I_OnUserNickChange }; - ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } void OnUserNickChange(User *u, const Anope::string &) anope_override diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 9f7e094a2..e3efdc6e6 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -202,7 +202,7 @@ struct IRCDMessageEncap : IRCDMessage if (u) { u->fingerprint = params[3]; - FOREACH_MOD(I_OnFingerprint, OnFingerprint(u)); + FOREACH_MOD(OnFingerprint, (u)); } } return; diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 6cf07342e..fa6dc15ed 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -920,7 +920,7 @@ struct IRCDMessageSASL : IRCDMessage return; IdentifyRequest *req = new UnrealSASLIdentifyRequest(this->owner, params[1], acc, pass); - FOREACH_MOD(I_OnCheckAuthentication, OnCheckAuthentication(NULL, req)); + FOREACH_MOD(OnCheckAuthentication, (NULL, req)); req->Dispatch(); } } @@ -1211,8 +1211,6 @@ class ProtoUnreal : public Module this->AddModes(); - Implementation i[] = { I_OnReload, I_OnUserNickChange, I_OnChannelSync, I_OnChanRegistered, I_OnDelChan, I_OnMLock, I_OnUnMLock }; - ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); ModuleManager::SetPriority(this, PRIORITY_FIRST); } -- cgit