moduleAddEventHook -> Module::AddEventHook.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1587 5417fbe8-f217-4b02-8779-1006273d7864

17 files changed, 42 insertions, 53 deletions

diff --git a/include/modules.h b/include/modules.h
index 9ffbd8ea3..0aee1d758 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -185,6 +185,14 @@ CoreExport class Module
 	 *
 	 **/
 	int AddEventHook(EvtHook *evh);
+
+	/**
+	 * Add a module message to the IRCD message hash
+	 * @param m the Message to add
+	 * @param pos the Position to add the message to, e.g. MOD_HEAD, MOD_TAIL, MOD_UNIQUE
+	 * @return MOD_ERR_OK on success, althing else on fail.
+	 **/
+	int AddEventHandler(EvtMessage *evm);
 };
 
 struct ModuleHash_ {
@@ -356,7 +364,6 @@ int destroyMessage(Message *m);					/* destroy a Message*/
 MDE EvtMessage *createEventHandler(char *name, int (*func) (const char *source, int ac, const char **av));
 EvtMessage *findEventHandler(EvtMessageHash * msgEvtTable[], const char *name);
 int addCoreEventHandler(EvtMessageHash * msgEvtTable[], EvtMessage * evm);
-MDE int moduleAddEventHandler(EvtMessage * evm);
 MDE int moduleEventDelHandler(char *name);
 int delEventHandler(EvtMessageHash * msgEvtTable[], EvtMessage * evm, const char *mod_name);
 int destroyEventHandler(EvtMessage * evm);
@@ -365,7 +372,6 @@ int addEventHandler(EvtMessageHash * msgEvtTable[], EvtMessage * evm);
 MDE EvtHook *createEventHook(const char *name, int (*func) (int argc, char **argv));
 EvtHook *findEventHook(EvtHookHash * HookEvtTable[], const char *name);
 int addCoreEventHook(EvtHookHash * HookEvtTable[], EvtHook * evh);
-MDE int moduleAddEventHook(EvtHook * evh);
 MDE int moduleEventDelHook(const char *name);
 int delEventHook(EvtHookHash * HookEvtTable[], EvtHook * evh, const char *mod_name);
 int destroyEventHook(EvtHook * evh);
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index 5632fbc2b..2c9b116a6 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -28,7 +28,7 @@ class BSFantasy : public Module
 		moduleAddVersion("$Id$");
 		this->SetType(CORE);
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index bc482dca4..dcb8c70f4 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -29,7 +29,7 @@ class BSFantasyKick : public Module
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index d35a6b6be..156edd78d 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -29,7 +29,7 @@ class BSFantasyKickBan : public Module
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index a74a71e77..21e86cee9 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -35,7 +35,7 @@ class BSFantasyOwner : public Module
 		}
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index 9999ed651..a561ad4e6 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -29,7 +29,7 @@ class BSFantasySeen : public Module
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index d7ff18cd3..aa3ef2c85 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -46,7 +46,7 @@ class OSLogonNews : public Module
 		moduleSetOperHelp(myOperServHelp);
 
 		hook = createEventHook(EVENT_RELOAD, reload_config);
-		if (moduleAddEventHook(hook) != MOD_ERR_OK)
+		if (this->AddEventHook(hook) != MOD_ERR_OK)
 		{
 			throw ModuleException("os_logonnews: Can't hook to EVENT_RELOAD event");
 		}
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index 0b77c1a81..9eb7e5081 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -44,7 +44,7 @@ class OSOperNews : public Module
 		moduleSetOperHelp(myOperServHelp);
 
 		hook = createEventHook(EVENT_RELOAD, reload_config);
-		if (moduleAddEventHook(hook) != MOD_ERR_OK)
+		if (this->AddEventHook(hook) != MOD_ERR_OK)
 			throw ModuleException("os_opernews: Can't hook to EVENT_RELOAD event");
 	}
 
diff --git a/src/events.c b/src/events.c
index f8a6f1601..006c3273e 100644
--- a/src/events.c
+++ b/src/events.c
@@ -477,38 +477,21 @@ int addCoreEventHook(EvtHookHash * hookEvtTable[], EvtHook * evh)
     return addEventHook(hookEvtTable, evh);
 }
 
-/**
- * Add a module message to the IRCD message hash
- * @param m the Message to add
- * @param pos the Position to add the message to, e.g. MOD_HEAD, MOD_TAIL, MOD_UNIQUE
- * @return MOD_ERR_OK on success, althing else on fail.
- **/
-int moduleAddEventHandler(EvtMessage * evm)
+int Module::AddEventHandler(EvtMessage *evm)
 {
-    int status;
-
-    if (!evm) {
-        return MOD_ERR_PARAMS;
-    }
+	int status;
 
-    /* ok, this appears to be a module adding a message from outside of AnopeInit, try to look up its module struct for it */
-    if ((mod_current_module_name) && (!mod_current_module)) {
-        mod_current_module = findModule(mod_current_module_name);
-    }
+	if (!evm)
+		return MOD_ERR_PARAMS;
 
-    if (!mod_current_module) {
-        return MOD_ERR_UNKNOWN;
-    }                           /* shouldnt happen */
-    evm->core = 0;
-    if (!evm->mod_name) {
-        evm->mod_name = sstrdup(mod_current_module->name.c_str());
-    }
+	evm->core = 0;
+	if (!evm->mod_name)
+		evm->mod_name = sstrdup(this->name.c_str());
 
-    status = addEventHandler(EVENT, evm);
-    if (debug) {
-        displayEvtMessageFromHash(evm->name);
-    }
-    return status;
+	status = addEventHandler(EVENT, evm);
+	if (debug)
+		displayEvtMessageFromHash(evm->name);
+	return status;
 }
 
 int Module::AddEventHook(EvtHook *evh)
diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index a0c342e5c..6efa267de 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -29,7 +29,7 @@ class BSFantasyUnban : public Module
 		this->SetType(CORE);
 
 		hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 	}
 };
 
diff --git a/src/modules/demos/events.c b/src/modules/demos/events.c
index dad0fd0e6..ba80cf03e 100644
--- a/src/modules/demos/events.c
+++ b/src/modules/demos/events.c
@@ -24,11 +24,11 @@ int AnopeInit(int argc, char **argv)
     status = moduleAddEventHandler(msg);
 
     hook = createEventHook(EVENT_DB_SAVING, my_save);
-    status = moduleAddEventHook(hook);
+    status = this->AddEventHook(hook);
 
 
     hook = createEventHook(EVENT_BOT_FANTASY, do_moo);
-    status = moduleAddEventHook(hook);
+    status = this->AddEventHook(hook);
     
     moduleAddAuthor(AUTHOR);
     moduleAddVersion(VERSION);
diff --git a/src/modules/demos/hs_conf.c b/src/modules/demos/hs_conf.c
index 45b4bb330..85b644501 100644
--- a/src/modules/demos/hs_conf.c
+++ b/src/modules/demos/hs_conf.c
@@ -26,7 +26,7 @@ int AnopeInit(int argc, char **argv) {
     status = moduleAddCommand(HOSTSERV, c, MOD_HEAD);
 
     hook = createEventHook(EVENT_RELOAD, mReadConfig);
-    status = moduleAddEventHook(hook);
+    status = this->AddEventHook(hook);
     
     if(status!=MOD_ERR_OK) {
 	return MOD_STOP;
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 94e161234..cd3672ef1 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -114,10 +114,10 @@ class HSRequest : public Module
 		moduleAddCommand(NICKSERV, c, MOD_HEAD);
 
 		hook = createEventHook(EVENT_DB_SAVING, hsreqevt_db_saving);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 
 		hook = createEventHook(EVENT_DB_BACKUP, hsreqevt_db_backup);
-		moduleAddEventHook(hook);
+		this->AddEventHook(hook);
 
 		moduleSetHostHelp(hs_help);
 		moduleAddAuthor(AUTHOR);
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index a25248bca..20d63eb67 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -49,7 +49,7 @@ class NSMaxEmail : public Module
 		moduleAddCommand(NICKSERV, c, MOD_HEAD);
 
 		evt = createEventHook(EVENT_RELOAD, my_event_reload);
-		if ((status = moduleAddEventHook(evt)))
+		if ((status = this->AddEventHook(evt)))
 		throw ModuleException("ns_maxemail: Unable to hook to EVENT_RELOAD");
 
 		my_load_config();
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index 4c138701b..580129065 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -89,15 +89,15 @@ class OSIgnoreDB : public Module
 		this->SetType(SUPPORTED);

 

 		hook = createEventHook(EVENT_RELOAD, reload_config);

-		if (moduleAddEventHook(hook) != MOD_ERR_OK)
+		if (this->AddEventHook(hook) != MOD_ERR_OK)
 			throw ModuleException("os_ignore_db: Can't hook to EVENT_RELOAD event");

 
 		hook = createEventHook(EVENT_DB_SAVING, save_ignoredb);

-		if (moduleAddEventHook(hook) != MOD_ERR_OK)
+		if (this->AddEventHook(hook) != MOD_ERR_OK)
 			throw ModuleException("os_ignore_db: Can't hook to EVENT_DB_SAVING event");

 

 		hook = createEventHook(EVENT_DB_BACKUP, backup_ignoredb);

-		if (moduleAddEventHook(hook) != MOD_ERR_OK)
+		if (this->AddEventHook(hook) != MOD_ERR_OK)
 			throw ModuleException("os_ignore_db: Can't hook to EVENT_DB_BACKUP event");

 

 		load_config();

diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 56ef50045..e36c04075 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -93,13 +93,13 @@ class OSInfo : public Module
 		status = moduleAddCommand(CHANSERV, c, MOD_TAIL);
 
 		hook = createEventHook(EVENT_DB_SAVING, mSaveData);
-		status = moduleAddEventHook(hook);
+		status = this->AddEventHook(hook);
 
 		hook = createEventHook(EVENT_DB_BACKUP, mBackupData);
-		status = moduleAddEventHook(hook);
+		status = this->AddEventHook(hook);
 
 		hook = createEventHook(EVENT_RELOAD, mEventReload);
-		status = moduleAddEventHook(hook);
+		status = this->AddEventHook(hook);
 
 		moduleSetNickHelp(mMainNickHelp);
 		moduleSetChanHelp(mMainChanHelp);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index ed712faf0..44f87da00 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1331,15 +1331,15 @@ class ProtoCharybdis : public Module
 		moduleAddIRCDMsgs();
 
 		hk = createEventHook(EVENT_NICK_IDENTIFY, charybdis_send_account);
-		moduleAddEventHook(hk);
+		this->AddEventHook(hk);
 
 		hk = createEventHook(EVENT_NICK_REGISTERED, charybdis_send_account);
-		moduleAddEventHook(hk);
+		this->AddEventHook(hk);
 
 		/* XXX: It'd be nice if we could have an event like this, but it's not there yet :( */
 		/* It's there now! Trystan said so! -GD */
 		hk = createEventHook(EVENT_NICK_LOGOUT, charybdis_send_deaccount);
-		moduleAddEventHook(hk);
+		this->AddEventHook(hk);
 	}
 
 	~ProtoCharybdis()