From d18d3f094cddedc6e6363f616eedb909eb02016a Mon Sep 17 00:00:00 2001 From: "Robin Burchell w00t@inspircd.org" Date: Sat, 8 Nov 2008 00:34:29 +0000 Subject: [PATCH] Convert moduleSetType() to not require a module pointer.. actually, this is probably the wrong way to go about this (we should use a member func), but who cares for now. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1580 5417fbe8-f217-4b02-8779-1006273d7864 --- include/modules.h | 7 ++++++- src/core/bs_act.c | 2 +- src/core/bs_assign.c | 2 +- src/core/bs_badwords.c | 2 +- src/core/bs_bot.c | 2 +- src/core/bs_botlist.c | 2 +- src/core/bs_fantasy.c | 2 +- src/core/bs_fantasy_kick.c | 2 +- src/core/bs_fantasy_kickban.c | 2 +- src/core/bs_fantasy_owner.c | 2 +- src/core/bs_fantasy_seen.c | 2 +- src/core/bs_help.c | 2 +- src/core/bs_info.c | 2 +- src/core/bs_kick.c | 2 +- src/core/bs_say.c | 2 +- src/core/bs_set.c | 2 +- src/core/bs_unassign.c | 2 +- src/core/cs_access.c | 2 +- src/core/cs_akick.c | 2 +- src/core/cs_ban.c | 2 +- src/core/cs_clear.c | 2 +- src/core/cs_drop.c | 2 +- src/core/cs_forbid.c | 2 +- src/core/cs_getkey.c | 2 +- src/core/cs_getpass.c | 2 +- src/core/cs_help.c | 2 +- src/core/cs_identify.c | 2 +- src/core/cs_info.c | 2 +- src/core/cs_invite.c | 2 +- src/core/cs_kick.c | 2 +- src/core/cs_list.c | 2 +- src/core/cs_logout.c | 2 +- src/core/cs_modes.c | 2 +- src/core/cs_register.c | 2 +- src/core/cs_sendpass.c | 2 +- src/core/cs_set.c | 2 +- src/core/cs_status.c | 2 +- src/core/cs_suspend.c | 2 +- src/core/cs_topic.c | 2 +- src/core/cs_xop.c | 2 +- src/core/enc_md5.c | 2 +- src/core/enc_none.c | 2 +- src/core/enc_old.c | 2 +- src/core/enc_sha1.c | 2 +- src/core/he_help.c | 2 +- src/core/hs_del.c | 2 +- src/core/hs_delall.c | 2 +- src/core/hs_group.c | 2 +- src/core/hs_help.c | 2 +- src/core/hs_list.c | 2 +- src/core/hs_off.c | 2 +- src/core/hs_on.c | 2 +- src/core/hs_set.c | 2 +- src/core/hs_setall.c | 2 +- src/core/ms_cancel.c | 2 +- src/core/ms_check.c | 2 +- src/core/ms_del.c | 2 +- src/core/ms_help.c | 2 +- src/core/ms_info.c | 2 +- src/core/ms_list.c | 2 +- src/core/ms_read.c | 2 +- src/core/ms_rsend.c | 2 +- src/core/ms_send.c | 2 +- src/core/ms_sendall.c | 2 +- src/core/ms_set.c | 2 +- src/core/ms_staff.c | 2 +- src/core/ns_access.c | 2 +- src/core/ns_alist.c | 2 +- src/core/ns_drop.c | 2 +- src/core/ns_forbid.c | 2 +- src/core/ns_getemail.c | 2 +- src/core/ns_getpass.c | 2 +- src/core/ns_ghost.c | 2 +- src/core/ns_group.c | 2 +- src/core/ns_help.c | 2 +- src/core/ns_identify.c | 2 +- src/core/ns_info.c | 2 +- src/core/ns_list.c | 2 +- src/core/ns_logout.c | 2 +- src/core/ns_recover.c | 2 +- src/core/ns_register.c | 2 +- src/core/ns_release.c | 2 +- src/core/ns_saset.c | 2 +- src/core/ns_sendpass.c | 2 +- src/core/ns_set.c | 2 +- src/core/ns_status.c | 2 +- src/core/ns_suspend.c | 2 +- src/core/ns_update.c | 2 +- src/core/os_admin.c | 2 +- src/core/os_akill.c | 2 +- src/core/os_chankill.c | 2 +- src/core/os_chanlist.c | 2 +- src/core/os_clearmodes.c | 2 +- src/core/os_defcon.c | 2 +- src/core/os_global.c | 2 +- src/core/os_help.c | 2 +- src/core/os_ignore.c | 2 +- src/core/os_jupe.c | 2 +- src/core/os_kick.c | 2 +- src/core/os_logonnews.c | 2 +- src/core/os_mode.c | 2 +- src/core/os_modinfo.c | 2 +- src/core/os_modlist.c | 2 +- src/core/os_modload.c | 2 +- src/core/os_modunload.c | 2 +- src/core/os_noop.c | 2 +- src/core/os_oline.c | 2 +- src/core/os_oper.c | 2 +- src/core/os_opernews.c | 2 +- src/core/os_quit.c | 2 +- src/core/os_randomnews.c | 2 +- src/core/os_raw.c | 2 +- src/core/os_reload.c | 2 +- src/core/os_restart.c | 2 +- src/core/os_session.c | 2 +- src/core/os_set.c | 2 +- src/core/os_sgline.c | 2 +- src/core/os_shutdown.c | 2 +- src/core/os_sqline.c | 2 +- src/core/os_staff.c | 2 +- src/core/os_stats.c | 2 +- src/core/os_svsnick.c | 2 +- src/core/os_szline.c | 2 +- src/core/os_umode.c | 2 +- src/core/os_update.c | 2 +- src/core/os_userlist.c | 2 +- src/modules.c | 16 +++++----------- src/modules/bs_fantasy_unban.c | 2 +- src/modules/cs_appendtopic.c | 2 +- src/modules/cs_enforce.c | 2 +- src/modules/cs_tban.c | 2 +- src/modules/hs_request.c | 2 +- src/modules/ns_maxemail.c | 2 +- src/modules/ns_noop_convert.c | 2 +- src/modules/os_ignore_db.c | 2 +- src/modules/os_info.c | 2 +- src/protocol/bahamut.c | 2 +- src/protocol/charybdis.c | 2 +- src/protocol/inspircd11.c | 2 +- src/protocol/inspircd12.cpp | 2 +- src/protocol/obsolete/hybrid.c | 2 +- src/protocol/obsolete/ptlink.c | 2 +- src/protocol/obsolete/rageircd.c | 2 +- src/protocol/obsolete/solidircd.c | 2 +- src/protocol/obsolete/ultimate3.c | 2 +- src/protocol/obsolete/viagra.c | 2 +- src/protocol/ratbox.c | 2 +- src/protocol/unreal32.c | 2 +- 148 files changed, 157 insertions(+), 158 deletions(-) diff --git a/include/modules.h b/include/modules.h index 737081b7e..328c6f96e 100644 --- a/include/modules.h +++ b/include/modules.h @@ -302,7 +302,12 @@ MDE int moduleAddRegHelp(Command * c, int (*func) (User * u)); MDE int moduleAddOperHelp(Command * c, int (*func) (User * u)); MDE int moduleAddAdminHelp(Command * c, int (*func) (User * u)); MDE int moduleAddRootHelp(Command * c, int (*func) (User * u)); -MDE void moduleSetType(MODType type); + +/** Sets a given type (CORE,PROTOCOL,3RD etc) on a module. + * @param m The module to set the type for + * @param type The type to set the module as. + */ +MDE void moduleSetType(Module *m, MODType type); extern MDE Module *mod_current_module; extern MDE const char *mod_current_module_name; extern MDE char *mod_current_buffer; diff --git a/src/core/bs_act.c b/src/core/bs_act.c index a253d61a8..2257c851c 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -27,7 +27,7 @@ class BSAct : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ACT", do_act, NULL, BOT_HELP_ACT, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 9eaf73018..40f3c2aba 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -27,7 +27,7 @@ class BSAssign : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ASSIGN", do_assign, NULL, BOT_HELP_ASSIGN, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index e5102b05c..575a024dc 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -30,7 +30,7 @@ class BSBadwords : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("BADWORDS", do_badwords, NULL, BOT_HELP_BADWORDS, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 815aa32b7..910a21e31 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -27,7 +27,7 @@ class BSBot : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("BOT", do_bot, is_services_admin, -1, -1, -1, BOT_SERVADMIN_HELP_BOT, BOT_SERVADMIN_HELP_BOT); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index e33830f71..6c991ef85 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -27,7 +27,7 @@ class BSBotList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("BOTLIST", do_botlist, NULL, BOT_HELP_BOTLIST, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c index 992fcbd39..f5272a2bc 100644 --- a/src/core/bs_fantasy.c +++ b/src/core/bs_fantasy.c @@ -26,7 +26,7 @@ class BSFantasy : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); } diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c index 33d7cb49a..79200ec2b 100644 --- a/src/core/bs_fantasy_kick.c +++ b/src/core/bs_fantasy_kick.c @@ -26,7 +26,7 @@ class BSFantasyKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c index 90dffffca..4e3e5fe2a 100644 --- a/src/core/bs_fantasy_kickban.c +++ b/src/core/bs_fantasy_kickban.c @@ -26,7 +26,7 @@ class BSFantasyKickBan : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c index 9aadedca9..08ee98c1f 100644 --- a/src/core/bs_fantasy_owner.c +++ b/src/core/bs_fantasy_owner.c @@ -26,7 +26,7 @@ class BSFantasyOwner : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); /* No need to load of we don't support owner */ if (!ircd->owner) diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c index 1546dcdc9..ed5495f1c 100644 --- a/src/core/bs_fantasy_seen.c +++ b/src/core/bs_fantasy_seen.c @@ -26,7 +26,7 @@ class BSFantasySeen : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/core/bs_help.c b/src/core/bs_help.c index e54e4f7ad..ce360be36 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -26,7 +26,7 @@ class BSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); } diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 25d40d239..d65d0e078 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -28,7 +28,7 @@ class BSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("INFO", do_info, NULL, BOT_HELP_INFO, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 9d80431ef..cbbb0f9ab 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -28,7 +28,7 @@ class BSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("KICK", do_kickcmd, NULL, BOT_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); c = createCommand("KICK BADWORDS", NULL, NULL, BOT_HELP_KICK_BADWORDS, -1, -1, -1, -1); diff --git a/src/core/bs_say.c b/src/core/bs_say.c index d970c05d6..5935f0250 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -27,7 +27,7 @@ class BSSay : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SAY", do_say, NULL, BOT_HELP_SAY, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_set.c b/src/core/bs_set.c index a60cae7d1..03f425a04 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -27,7 +27,7 @@ class BSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", do_set, NULL, BOT_HELP_SET, -1, -1, BOT_SERVADMIN_HELP_SET, BOT_SERVADMIN_HELP_SET); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index ad3e308ca..1885685a7 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -27,7 +27,7 @@ class BSUnassign : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("UNASSIGN", do_unassign, NULL, BOT_HELP_UNASSIGN, -1, -1, -1, -1); moduleAddCommand(BOTSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 2c54d0038..b63f9e9b1 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -31,7 +31,7 @@ class CSAccess : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ACCESS", do_access, NULL, CHAN_HELP_ACCESS, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 2fe17ca9c..3659c73af 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -29,7 +29,7 @@ class CSAKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("AKICK", do_akick, NULL, CHAN_HELP_AKICK, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 2f4c1d81e..e7d77b23b 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -28,7 +28,7 @@ class CSBan : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("BAN", do_ban, NULL, CHAN_HELP_BAN, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index da3f7b52a..8bb2b493f 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -27,7 +27,7 @@ class CSClear : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CLEAR", do_clear, NULL, CHAN_HELP_CLEAR, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 14e8c3a6b..f80b17fac 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -27,7 +27,7 @@ class CSDrop : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DROP", do_drop, NULL, -1, CHAN_HELP_DROP, -1, CHAN_SERVADMIN_HELP_DROP, CHAN_SERVADMIN_HELP_DROP); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index ff45236d2..344db11b1 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -27,7 +27,7 @@ class CSForbid : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_FORBID, CHAN_SERVADMIN_HELP_FORBID); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c index c29de8f91..2ec7c6e67 100644 --- a/src/core/cs_getkey.c +++ b/src/core/cs_getkey.c @@ -27,7 +27,7 @@ class CSGetKey : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GETKEY", do_getkey, NULL, CHAN_HELP_GETKEY, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c index 52d0c0271..611ceadbd 100644 --- a/src/core/cs_getpass.c +++ b/src/core/cs_getpass.c @@ -27,7 +27,7 @@ class CSGetPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_GETPASS, CHAN_SERVADMIN_HELP_GETPASS); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_help.c b/src/core/cs_help.c index bfded62fc..3b8c7b873 100644 --- a/src/core/cs_help.c +++ b/src/core/cs_help.c @@ -26,7 +26,7 @@ class CSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c index 9d105a874..9e6bd2ae8 100644 --- a/src/core/cs_identify.c +++ b/src/core/cs_identify.c @@ -27,7 +27,7 @@ class CSIdentify : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("IDENTIFY", do_identify, NULL, CHAN_HELP_IDENTIFY, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_info.c b/src/core/cs_info.c index a0a345340..cc5aebf9b 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -27,7 +27,7 @@ class CSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("INFO", do_info, NULL, CHAN_HELP_INFO, -1, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO, CHAN_SERVADMIN_HELP_INFO); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 9d8741dfb..5da9445d5 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -27,7 +27,7 @@ class CSInvite : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("INVITE", do_invite, NULL, CHAN_HELP_INVITE, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 9b73d366c..754d7a2e0 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -27,7 +27,7 @@ class CSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("KICK", do_cs_kick, NULL, CHAN_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_list.c b/src/core/cs_list.c index 935a41067..89dad7a55 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -27,7 +27,7 @@ class CSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LIST", do_list, NULL, -1, CHAN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST, CHAN_SERVADMIN_HELP_LIST); diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c index d2838f1d3..15a2f1823 100644 --- a/src/core/cs_logout.c +++ b/src/core/cs_logout.c @@ -28,7 +28,7 @@ class CSLogout : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LOGOUT", do_logout, NULL, -1, CHAN_HELP_LOGOUT, -1, CHAN_SERVADMIN_HELP_LOGOUT, CHAN_SERVADMIN_HELP_LOGOUT); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 3fd050999..44c02bccf 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -37,7 +37,7 @@ class CSModes : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_register.c b/src/core/cs_register.c index a36f2abb6..01a75344f 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -27,7 +27,7 @@ class CSRegister : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("REGISTER", do_register, NULL, CHAN_HELP_REGISTER, -1, -1, -1, -1); c->help_param1 = s_NickServ; diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c index 08d06e024..2d08ce3b7 100644 --- a/src/core/cs_sendpass.c +++ b/src/core/cs_sendpass.c @@ -28,7 +28,7 @@ class CSSendPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SENDPASS", do_sendpass, NULL, CHAN_HELP_SENDPASS, -1, -1, -1, -1); diff --git a/src/core/cs_set.c b/src/core/cs_set.c index a9e429f89..ca34c11c0 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -49,7 +49,7 @@ class CSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", do_set, NULL, CHAN_HELP_SET, -1, -1, CHAN_SERVADMIN_HELP_SET, CHAN_SERVADMIN_HELP_SET); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_status.c b/src/core/cs_status.c index 04fceb1f8..618deb464 100644 --- a/src/core/cs_status.c +++ b/src/core/cs_status.c @@ -27,7 +27,7 @@ class CSStatus : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("STATUS", do_status, is_services_admin, -1, -1, -1, CHAN_SERVADMIN_HELP_STATUS, CHAN_SERVADMIN_HELP_STATUS); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index 232532c22..b05690ca9 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -28,7 +28,7 @@ class CSSuspend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_SUSPEND, CHAN_SERVADMIN_HELP_SUSPEND); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 13ac4d767..85ea36dce 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -27,7 +27,7 @@ class CSTopic : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("TOPIC", do_cs_topic, NULL, CHAN_HELP_TOPIC, -1, -1,-1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index ec5fc107e..97b0c183e 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -91,7 +91,7 @@ class CSXOP : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("AOP", do_aop, NULL, CHAN_HELP_AOP, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c index 70aa05cf8..090969e2c 100644 --- a/src/core/enc_md5.c +++ b/src/core/enc_md5.c @@ -390,7 +390,7 @@ class EMD5 : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(ENCRYPTION); + moduleSetType(this, ENCRYPTION); encmodule_encrypt(md5_encrypt); encmodule_encrypt_in_place(md5_encrypt_in_place); diff --git a/src/core/enc_none.c b/src/core/enc_none.c index b0bac3005..fbc8c03af 100644 --- a/src/core/enc_none.c +++ b/src/core/enc_none.c @@ -22,7 +22,7 @@ class ENone : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(ENCRYPTION); + moduleSetType(this, ENCRYPTION); encmodule_encrypt(plain_encrypt); encmodule_encrypt_in_place(plain_encrypt_in_place); diff --git a/src/core/enc_old.c b/src/core/enc_old.c index ebd0b7956..2b08892a9 100644 --- a/src/core/enc_old.c +++ b/src/core/enc_old.c @@ -417,7 +417,7 @@ class EOld : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(ENCRYPTION); + moduleSetType(this, ENCRYPTION); encmodule_encrypt(old_encrypt); encmodule_encrypt_in_place(old_encrypt_in_place); diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c index 38d8c1f23..ce136d044 100644 --- a/src/core/enc_sha1.c +++ b/src/core/enc_sha1.c @@ -255,7 +255,7 @@ class ESHA1 : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(ENCRYPTION); + moduleSetType(this, ENCRYPTION); encmodule_encrypt(sha1_encrypt); encmodule_encrypt_in_place(sha1_encrypt_in_place); diff --git a/src/core/he_help.c b/src/core/he_help.c index 0739b0d28..c3526c396 100644 --- a/src/core/he_help.c +++ b/src/core/he_help.c @@ -26,7 +26,7 @@ class HEHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(HELPSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_del.c b/src/core/hs_del.c index 61e48a311..c85f40f1e 100644 --- a/src/core/hs_del.c +++ b/src/core/hs_del.c @@ -27,7 +27,7 @@ class HSDel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DEL", do_del, is_host_remover, HOST_HELP_DEL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c index b7ba2f978..6cdcd536d 100644 --- a/src/core/hs_delall.c +++ b/src/core/hs_delall.c @@ -27,7 +27,7 @@ class HSDelAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DELALL", do_delall, is_host_remover, HOST_HELP_DELALL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_group.c b/src/core/hs_group.c index e670bc339..409386cd0 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -30,7 +30,7 @@ class HSGroup : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GROUP", do_group, NULL, HOST_HELP_GROUP, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_help.c b/src/core/hs_help.c index 9bb909ec1..135a2c218 100644 --- a/src/core/hs_help.c +++ b/src/core/hs_help.c @@ -26,7 +26,7 @@ class HSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_list.c b/src/core/hs_list.c index 21bb0eacc..c39f42403 100644 --- a/src/core/hs_list.c +++ b/src/core/hs_list.c @@ -27,7 +27,7 @@ class HSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LIST", listOut, is_services_oper, -1, -1, HOST_HELP_LIST, HOST_HELP_LIST, HOST_HELP_LIST); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_off.c b/src/core/hs_off.c index ba7915777..c6663ff26 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -27,7 +27,7 @@ class HSOff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("OFF", do_off, NULL, HOST_HELP_OFF, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_on.c b/src/core/hs_on.c index a9f0045cd..20a683ad3 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -27,7 +27,7 @@ class HSOn : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ON", do_on, NULL, HOST_HELP_ON, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_set.c b/src/core/hs_set.c index 4cea04a45..5c8bf8af5 100644 --- a/src/core/hs_set.c +++ b/src/core/hs_set.c @@ -27,7 +27,7 @@ class HSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", myDoSet, is_host_setter, HOST_HELP_SET, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c index cb5fefa5a..b15b51870 100644 --- a/src/core/hs_setall.c +++ b/src/core/hs_setall.c @@ -29,7 +29,7 @@ class HSSetAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SETALL", do_setall, is_host_setter, HOST_HELP_SETALL, -1, -1, -1, -1); moduleAddCommand(HOSTSERV, c, MOD_UNIQUE); diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c index aaa8bd117..edaf9a3bd 100644 --- a/src/core/ms_cancel.c +++ b/src/core/ms_cancel.c @@ -27,7 +27,7 @@ class MSCancel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CANCEL", do_cancel, NULL, MEMO_HELP_CANCEL, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_check.c b/src/core/ms_check.c index db5201f27..03ceaa58d 100644 --- a/src/core/ms_check.c +++ b/src/core/ms_check.c @@ -27,7 +27,7 @@ class MSCheck : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CHECK", do_memocheck, NULL, MEMO_HELP_CHECK, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_del.c b/src/core/ms_del.c index 406804edc..2467c0a47 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -28,7 +28,7 @@ class MSDel : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DEL", do_del, NULL, MEMO_HELP_DEL, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_help.c b/src/core/ms_help.c index d55c592c1..5b937f220 100644 --- a/src/core/ms_help.c +++ b/src/core/ms_help.c @@ -26,7 +26,7 @@ class MSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); } diff --git a/src/core/ms_info.c b/src/core/ms_info.c index 4f9911254..fda116432 100644 --- a/src/core/ms_info.c +++ b/src/core/ms_info.c @@ -27,7 +27,7 @@ class MSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("INFO", do_info, NULL, -1, MEMO_HELP_INFO, -1, MEMO_SERVADMIN_HELP_INFO, MEMO_SERVADMIN_HELP_INFO); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_list.c b/src/core/ms_list.c index e709fb3a8..1d504030a 100644 --- a/src/core/ms_list.c +++ b/src/core/ms_list.c @@ -28,7 +28,7 @@ class MSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LIST", do_list, NULL, MEMO_HELP_LIST, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_read.c b/src/core/ms_read.c index f68a4d5b4..242313d83 100644 --- a/src/core/ms_read.c +++ b/src/core/ms_read.c @@ -31,7 +31,7 @@ class MSRead : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("READ", do_read, NULL, MEMO_HELP_READ, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c index b7e32bb36..ffe41b4cd 100644 --- a/src/core/ms_rsend.c +++ b/src/core/ms_rsend.c @@ -27,7 +27,7 @@ class MSRSend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("RSEND", do_rsend, NULL, MEMO_HELP_RSEND, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_send.c b/src/core/ms_send.c index 04fab0dd0..e3c1ee6d0 100644 --- a/src/core/ms_send.c +++ b/src/core/ms_send.c @@ -27,7 +27,7 @@ class MSSend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SEND", do_send, NULL, MEMO_HELP_SEND, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c index 34f9eb043..11ad43647 100644 --- a/src/core/ms_sendall.c +++ b/src/core/ms_sendall.c @@ -27,7 +27,7 @@ class MSSendAll : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SENDALL", do_sendall, is_services_admin, -1, -1, -1, MEMO_HELP_SENDALL, MEMO_HELP_SENDALL); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ms_set.c b/src/core/ms_set.c index 68b27f33c..7e0185c2c 100644 --- a/src/core/ms_set.c +++ b/src/core/ms_set.c @@ -29,7 +29,7 @@ class MSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", do_set, NULL, MEMO_HELP_SET, -1, -1, -1, -1); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c index 84470fd8f..f584a5edf 100644 --- a/src/core/ms_staff.c +++ b/src/core/ms_staff.c @@ -27,7 +27,7 @@ class MSStaff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("STAFF", do_staff, is_services_oper, -1, -1, MEMO_HELP_STAFF, MEMO_HELP_STAFF, MEMO_HELP_STAFF); moduleAddCommand(MEMOSERV, c, MOD_UNIQUE); moduleSetMemoHelp(myMemoServHelp); diff --git a/src/core/ns_access.c b/src/core/ns_access.c index 9aec70950..a7bbe4ddc 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -27,7 +27,7 @@ class NSAccess : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index abd3eb5a8..58296c2ae 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -27,7 +27,7 @@ class NSAList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, NICK_SERVADMIN_HELP_ALIST, NICK_SERVADMIN_HELP_ALIST); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index 0cba1a0e4..f41929443 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -28,7 +28,7 @@ class NSDrop : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1, NICK_SERVADMIN_HELP_DROP, NICK_SERVADMIN_HELP_DROP); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index ff203d9d6..6ef085050 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -28,7 +28,7 @@ class NSForbid : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_FORBID, NICK_SERVADMIN_HELP_FORBID); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index fccd3b0bb..1b3c54f40 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -32,7 +32,7 @@ class NSGetEMail : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETEMAIL, NICK_SERVADMIN_HELP_GETEMAIL); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 2e9aac9a8..16e34a2fe 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -27,7 +27,7 @@ class NSGetPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETPASS, NICK_SERVADMIN_HELP_GETPASS); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index 130b8ecaf..af74641e0 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -27,7 +27,7 @@ class NSGhost : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 4caaa9061..150dba560 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -34,7 +34,7 @@ class NSGroup : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_help.c b/src/core/ns_help.c index a0f0839c2..6bb21b021 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -26,7 +26,7 @@ class NSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index 31008306b..a99fcf24a 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -31,7 +31,7 @@ class NSIdentify : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_info.c b/src/core/ns_info.c index c46c46bda..d2528d894 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -28,7 +28,7 @@ class NSInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1, NICK_HELP_INFO, NICK_SERVADMIN_HELP_INFO, NICK_SERVADMIN_HELP_INFO); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_list.c b/src/core/ns_list.c index ddbeb2825..b20be6386 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -27,7 +27,7 @@ class NSList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST); diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index fd8ab1ff4..cb1c64e06 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -30,7 +30,7 @@ class NSLogout : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, NICK_SERVADMIN_HELP_LOGOUT, NICK_SERVADMIN_HELP_LOGOUT); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 08c265fee..da9cfb41a 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -28,7 +28,7 @@ class NSRecover : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_register.c b/src/core/ns_register.c index a4b5cb151..ca919080a 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -34,7 +34,7 @@ class NSRegister : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_release.c b/src/core/ns_release.c index 7eab2f6e6..12e8f9e7e 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -28,7 +28,7 @@ class NSRelease : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 9ca8ae236..0354fe0cb 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -42,7 +42,7 @@ class NSSASet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, NICK_HELP_SASET, NICK_HELP_SASET); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index 30b26a6d8..419acb2ae 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -28,7 +28,7 @@ class NSSendPass : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 4612bf103..7be913ae0 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -41,7 +41,7 @@ class NSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_status.c b/src/core/ns_status.c index f8e5b200b..398f59018 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -27,7 +27,7 @@ class NSStatus : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 4dc39c133..bf4b93410 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -28,7 +28,7 @@ class NSSuspend : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_SUSPEND, NICK_SERVADMIN_HELP_SUSPEND); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/ns_update.c b/src/core/ns_update.c index 4e70672dd..49b6c45ef 100644 --- a/src/core/ns_update.c +++ b/src/core/ns_update.c @@ -27,7 +27,7 @@ class NSUpdate : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); diff --git a/src/core/os_admin.c b/src/core/os_admin.c index a57b44ad8..0e22968f0 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -30,7 +30,7 @@ class OSAdmin : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("ADMIN", do_admin, NULL, OPER_HELP_ADMIN, -1, -1, -1, -1); c->help_param1 = s_NickServ; diff --git a/src/core/os_akill.c b/src/core/os_akill.c index 8714e9d73..c50bc17f7 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -33,7 +33,7 @@ class OSAKill : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("AKILL", do_akill, is_services_oper, OPER_HELP_AKILL, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index 0f1023a99..6886c670a 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -27,7 +27,7 @@ class OSChanKill : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CHANKILL", do_chankill, is_services_admin, OPER_HELP_CHANKILL, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index 7aa0097f3..d5c8e6700 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -30,7 +30,7 @@ class OSChanList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CHANLIST", do_chanlist, is_services_oper, OPER_HELP_CHANLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 9df371aa9..54de301ce 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -28,7 +28,7 @@ class OSClearModes : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("CLEARMODES", do_clearmodes, is_services_oper, OPER_HELP_CLEARMODES, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index bc1f5fd15..7ec0e7b60 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -33,7 +33,7 @@ class OSDEFCON : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("DEFCON", do_defcon, is_services_admin, OPER_HELP_DEFCON, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_global.c b/src/core/os_global.c index 15f771fee..64221dff6 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -27,7 +27,7 @@ class OSGlobal : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1); c->help_param1 = s_GlobalNoticer; diff --git a/src/core/os_help.c b/src/core/os_help.c index aa086af5e..f551d179f 100644 --- a/src/core/os_help.c +++ b/src/core/os_help.c @@ -26,7 +26,7 @@ class OSHelp : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); } diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index 1f1597408..abd4a8704 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -28,7 +28,7 @@ class OSIgnore : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("IGNORE", do_ignoreuser, is_services_admin, OPER_HELP_IGNORE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 8ef11faae..c7c8da744 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -27,7 +27,7 @@ class OSJupe : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("JUPE", do_jupe, is_services_admin, OPER_HELP_JUPE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_kick.c b/src/core/os_kick.c index 69ebad838..ec29c0a4d 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -27,7 +27,7 @@ class OSKick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("KICK", do_os_kick, is_services_oper, OPER_HELP_KICK, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c index ea3889e4d..43c82a2b9 100644 --- a/src/core/os_logonnews.c +++ b/src/core/os_logonnews.c @@ -31,7 +31,7 @@ class OSLogonNews : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); /** * For some unknown reason, do_logonnews is actaully defined in news.c diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 0376f6c36..9a63ac618 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -27,7 +27,7 @@ class OSMode : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("MODE", do_os_mode, is_services_oper, OPER_HELP_MODE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c index 80cf9ea1c..f63caeefb 100644 --- a/src/core/os_modinfo.c +++ b/src/core/os_modinfo.c @@ -29,7 +29,7 @@ class OSModInfo : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("MODINFO", do_modinfo, NULL, -1, -1, -1, -1, OPER_HELP_MODINFO); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c index ceba165cb..282ba8634 100644 --- a/src/core/os_modlist.c +++ b/src/core/os_modlist.c @@ -27,7 +27,7 @@ class OSModList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("MODLIST", do_modlist, NULL, -1, -1, -1, -1, OPER_HELP_MODLIST); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modload.c b/src/core/os_modload.c index d1a906c31..71fe5ae28 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -27,7 +27,7 @@ class OSModLoad : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("MODLOAD", do_modload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODLOAD); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index 2c967f84d..94f43bab2 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -28,7 +28,7 @@ class OSModUnLoad : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("MODUNLOAD", do_modunload, is_services_root, -1, -1, -1, -1, OPER_HELP_MODUNLOAD); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_noop.c b/src/core/os_noop.c index f85bc06e5..429477b78 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -27,7 +27,7 @@ class OSNOOP : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("NOOP", do_noop, is_services_admin, OPER_HELP_NOOP, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 0c50ca1a7..7e1fc7f0c 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -27,7 +27,7 @@ class OSOLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("OLINE", do_operoline, is_services_root, OPER_HELP_OLINE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_oper.c b/src/core/os_oper.c index 6ac8c91f6..b14e6aed9 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -30,7 +30,7 @@ class OSOper : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("OPER", do_oper, NULL, OPER_HELP_OPER, -1, -1, -1, -1); c->help_param1 = s_NickServ; moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c index 2d277ee09..3a0c55299 100644 --- a/src/core/os_opernews.c +++ b/src/core/os_opernews.c @@ -31,7 +31,7 @@ class OSOperNews : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); /** XXX: For some unknown reason, do_opernews is actaully defined in news.c * we can look at moving it here later diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 885610e05..8bb4d8fc1 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -27,7 +27,7 @@ class OSQuit : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c index 25e6f5517..6b2db1bfa 100644 --- a/src/core/os_randomnews.c +++ b/src/core/os_randomnews.c @@ -27,7 +27,7 @@ class OSRandomNews : public Module moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); /** XXX: For some unknown reason, do_randomnews is actaully defined in news.c * we can look at moving it here later diff --git a/src/core/os_raw.c b/src/core/os_raw.c index 2a252505e..c8c95252d 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -26,7 +26,7 @@ class OSRaw : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(THIRD); + moduleSetType(this, THIRD); c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_reload.c b/src/core/os_reload.c index 44057ac5b..b756ad124 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -27,7 +27,7 @@ class OSReload : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 2dfcf35d9..df5493916 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -32,7 +32,7 @@ class OSRestart : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_session.c b/src/core/os_session.c index 43f7971d6..46a410c3a 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -26,7 +26,7 @@ class OSSession : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); /** * do_session/do_exception are exported from sessions.c - we just want to provide an interface. diff --git a/src/core/os_set.c b/src/core/os_set.c index c7dc19602..40c45e89c 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -27,7 +27,7 @@ class OSSet : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 6cdce0e71..39bc1a700 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -34,7 +34,7 @@ class OSSGLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SGLINE", do_sgline, is_services_oper, OPER_HELP_SGLINE, -1, -1, -1, -1); diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 930048bee..21d654bc0 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -27,7 +27,7 @@ class OSShutdown : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index 3d1456160..b4d6db43e 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -34,7 +34,7 @@ class OSSQLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SQLINE", do_sqline, is_services_oper, OPER_HELP_SQLINE, -1, -1, -1, -1); diff --git a/src/core/os_staff.c b/src/core/os_staff.c index d61a188be..2215e4fc1 100644 --- a/src/core/os_staff.c +++ b/src/core/os_staff.c @@ -30,7 +30,7 @@ class OSStaff : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("STAFF", do_staff, NULL, OPER_HELP_STAFF, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_stats.c b/src/core/os_stats.c index f7dcc30ba..c0a2ea601 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -30,7 +30,7 @@ class OSStats : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 9841445cd..5acc54011 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -27,7 +27,7 @@ class OSSVSNick : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SVSNICK", do_svsnick, is_services_root, OPER_HELP_SVSNICK, -1, -1, -1, -1); diff --git a/src/core/os_szline.c b/src/core/os_szline.c index 3f788e606..3a34a5380 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -33,7 +33,7 @@ class OSSZLine : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("SZLINE", do_szline, is_services_oper, OPER_HELP_SZLINE, -1, -1, -1, -1); diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 66221d788..2ae8d1491 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -27,7 +27,7 @@ class OSUMode : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("UMODE", do_operumodes, is_services_root, OPER_HELP_UMODE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_update.c b/src/core/os_update.c index d59e02fd9..7ffd2e713 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -27,7 +27,7 @@ class OSUpdate : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c index 6f7ce332a..c0ef3f449 100644 --- a/src/core/os_userlist.c +++ b/src/core/os_userlist.c @@ -32,7 +32,7 @@ class OSUserList : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/modules.c b/src/modules.c index 2f4eb6285..f4231c638 100644 --- a/src/modules.c +++ b/src/modules.c @@ -233,9 +233,10 @@ int encryption_module_init(void) { alog("Loading Encryption Module: [%s]", EncModule); ret = loadModule(EncModule, NULL); - moduleSetType(ENCRYPTION); if (ret != MOD_ERR_OK) alog("ERROR: status: [%d][%s]", ret, ModuleGetErrStr(ret)); + else + moduleSetType(findModule(EncModule), ENCRYPTION); mod_current_module = NULL; return ret; } @@ -249,10 +250,10 @@ int protocol_module_init(void) alog("Loading IRCD Protocol Module: [%s]", IRCDModule); ret = loadModule(IRCDModule, NULL); - moduleSetType(PROTOCOL); if (ret == MOD_ERR_OK) { + moduleSetType(findModule(IRCDModule), PROTOCOL); /* This is really NOT the correct place to do config checks, but * as we only have the ircd struct filled here, we have to over * here. -GD @@ -767,16 +768,9 @@ int unloadModule(Module * m, User * u) } } -/** - * Module setType() - * Lets the module set a type, CORE,PROTOCOL,3RD etc.. - **/ -void moduleSetType(MODType type) +void moduleSetType(Module *m, MODType type) { - if ((mod_current_module_name) && (!mod_current_module)) { - mod_current_module = findModule(mod_current_module_name); - } - mod_current_module->type = type; + m->type = type; } /** diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c index 3324ee169..e1bf22096 100644 --- a/src/modules/bs_fantasy_unban.c +++ b/src/modules/bs_fantasy_unban.c @@ -26,7 +26,7 @@ class BSFantasyUnban : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(CORE); + moduleSetType(this, CORE); hook = createEventHook(EVENT_BOT_FANTASY, do_fantasy); moduleAddEventHook(hook); diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 06860d18b..7c0144e5b 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -62,7 +62,7 @@ class CSAppendTopic : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); c = createCommand("APPENDTOPIC", my_cs_appendtopic, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_HEAD); diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 971dacc35..7a353c57f 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -41,7 +41,7 @@ class CSEnforce : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); c = createCommand("ENFORCE", my_cs_enforce, NULL, -1, -1, -1, -1, -1); moduleAddCommand(CHANSERV, c, MOD_HEAD); diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index 4f90074e3..03bc2f019 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -55,7 +55,7 @@ class CSTBan : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); } }; diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index 16135568b..eee65f2ef 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -122,7 +122,7 @@ class HSRequest : public Module moduleSetHostHelp(hs_help); moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); my_load_config(); my_add_languages(); diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index cd27556e3..5e8d621de 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -41,7 +41,7 @@ class NSMaxEmail : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); c = createCommand("REGISTER", my_ns_register, NULL, -1, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_HEAD); diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c index 2a8a206ce..576d01486 100644 --- a/src/modules/ns_noop_convert.c +++ b/src/modules/ns_noop_convert.c @@ -68,7 +68,7 @@ class NSNOOPConvert : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); if (mLoadConfig(0, NULL)) throw ModuleException("Couldn't load config?"); diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c index 1d2ad7942..e9038292f 100644 --- a/src/modules/os_ignore_db.c +++ b/src/modules/os_ignore_db.c @@ -86,7 +86,7 @@ class OSIgnoreDB : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); hook = createEventHook(EVENT_RELOAD, reload_config); if (moduleAddEventHook(hook) != MOD_ERR_OK) diff --git a/src/modules/os_info.c b/src/modules/os_info.c index 47d5b8937..15f940e34 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -73,7 +73,7 @@ class OSInfo : public Module moduleAddAuthor(AUTHOR); moduleAddVersion(VERSION); - moduleSetType(SUPPORTED); + moduleSetType(this, SUPPORTED); if (mLoadConfig()) throw ModuleException("Unable to load config"); diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 4c18ab350..20acdb727 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1049,7 +1049,7 @@ class ProtoBahamut : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 9ea31296a..c7dc34015 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1304,7 +1304,7 @@ class ProtoCharybdis : public Module moduleAddAuthor("Anope"); moduleAddVersion("$Id: charybdis.c 953 2006-01-14 11:36:29Z certus $"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("Charybdis 1.0/1.1+"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index d182224aa..1701b00bf 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1323,7 +1323,7 @@ class ProtoInspIRCd : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("inspircdIRCd 1.1"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 65f8e53fc..678a7acbf 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -1316,7 +1316,7 @@ class ProtoInspIRCd : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); TS6SID = sstrdup(Numeric); diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c index 528851f23..80e148d4a 100644 --- a/src/protocol/obsolete/hybrid.c +++ b/src/protocol/obsolete/hybrid.c @@ -1535,7 +1535,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("Hybrid IRCd 7.0"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c index 3085f1337..c6fbc4691 100644 --- a/src/protocol/obsolete/ptlink.c +++ b/src/protocol/obsolete/ptlink.c @@ -1765,7 +1765,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("PTlink 6.15.*+"); diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c index b1e4c0320..0ea23c065 100644 --- a/src/protocol/obsolete/rageircd.c +++ b/src/protocol/obsolete/rageircd.c @@ -1645,7 +1645,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("RageIRCd 2.0.x"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c index 75cefd70a..95c70f201 100644 --- a/src/protocol/obsolete/solidircd.c +++ b/src/protocol/obsolete/solidircd.c @@ -1678,7 +1678,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("Solid-IRCd 3.4.*"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c index 8243af1a0..b8cf0b15f 100644 --- a/src/protocol/obsolete/ultimate3.c +++ b/src/protocol/obsolete/ultimate3.c @@ -1786,7 +1786,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion ("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("UltimateIRCd 3.0.0.a26+"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c index a1fdcf066..8b6c88f81 100644 --- a/src/protocol/obsolete/viagra.c +++ b/src/protocol/obsolete/viagra.c @@ -1684,7 +1684,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("ViagraIRCd 1.3.x"); pmodule_ircd_cap(myIrcdcap); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 952114f78..e685428a6 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1176,7 +1176,7 @@ class ProtoRatbox : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); if (UseTS6) { diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 8dbb31340..c3436f45b 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1526,7 +1526,7 @@ class ProtoUnreal : public Module { moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); - moduleSetType(PROTOCOL); + moduleSetType(this, PROTOCOL); pmodule_ircd_version("UnrealIRCd 3.2+"); pmodule_ircd_cap(myIrcdcap);