pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-04 00:23:12 +02:00
Code Activity

moduleAddEventHook -> Module::AddEventHook.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1587 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-08 01:30:43 +00:00
parent 7571ca327e
commit 26cdf257cc
17 changed files with 42 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules.h
+8 -2
View File
@@ -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);
src/core/bs_fantasy.c
+1 -1
View File
@@ -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);
}
};
src/core/bs_fantasy_kick.c
+1 -1
View File
@@ -29,7 +29,7 @@ class BSFantasyKick : public Module
this->SetType(CORE);
hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
moduleAddEventHook(hook);
this->AddEventHook(hook);
}
};
src/core/bs_fantasy_kickban.c
+1 -1
View File
@@ -29,7 +29,7 @@ class BSFantasyKickBan : public Module
this->SetType(CORE);
hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
moduleAddEventHook(hook);
this->AddEventHook(hook);
}
};
src/core/bs_fantasy_owner.c
+1 -1
View File
@@ -35,7 +35,7 @@ class BSFantasyOwner : public Module
}
hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
moduleAddEventHook(hook);
this->AddEventHook(hook);
}
};
src/core/bs_fantasy_seen.c
+1 -1
View File
@@ -29,7 +29,7 @@ class BSFantasySeen : public Module
this->SetType(CORE);
hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
moduleAddEventHook(hook);
this->AddEventHook(hook);
}
};
src/core/os_logonnews.c
+1 -1
View File
@@ -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");
}
src/core/os_opernews.c
+1 -1
View File
@@ -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");
}
src/events.c
+11 -28
View File
@@ -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;
int status;
if (!evm) {
return MOD_ERR_PARAMS;
}
if (!evm)
return MOD_ERR_PARAMS;
/* 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);
}
evm->core = 0;
if (!evm->mod_name)
evm->mod_name = sstrdup(this->name.c_str());
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());
}
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)
src/modules/bs_fantasy_unban.c
+1 -1
View File
@@ -29,7 +29,7 @@ class BSFantasyUnban : public Module
this->SetType(CORE);
hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy);
moduleAddEventHook(hook);
this->AddEventHook(hook);
}
};
src/modules/demos/events.c
+2 -2
View File
@@ -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);
src/modules/demos/hs_conf.c
+1 -1
View File
@@ -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;
src/modules/hs_request.c
+2 -2
View File
@@ -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);
src/modules/ns_maxemail.c
+1 -1
View File
@@ -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();
src/modules/os_ignore_db.c
+3 -3
View File
@@ -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();
src/modules/os_info.c
+3 -3
View File
@@ -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);
src/protocol/charybdis.c
+3 -3
View File
@@ -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()