From ca8648592789cfd29bd8b02385e8bd1bfdf123a8 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 19 May 2013 21:27:26 +0000 Subject: [PATCH] - Remove token parameter from CommandAdd(). --- include/modules.h | 2 +- src/api-command.c | 5 ++--- src/modules/m_addline.c | 2 +- src/modules/m_addmotd.c | 2 +- src/modules/m_addomotd.c | 2 +- src/modules/m_admin.c | 2 +- src/modules/m_adminchat.c | 2 +- src/modules/m_akill.c | 2 +- src/modules/m_away.c | 2 +- src/modules/m_botmotd.c | 2 +- src/modules/m_cap.c | 2 +- src/modules/m_chatops.c | 2 +- src/modules/m_chghost.c | 2 +- src/modules/m_chgident.c | 2 +- src/modules/m_chgname.c | 4 ++-- src/modules/m_close.c | 2 +- src/modules/m_connect.c | 2 +- src/modules/m_cycle.c | 2 +- src/modules/m_dccallow.c | 2 +- src/modules/m_dccdeny.c | 2 +- src/modules/m_dummy.c | 2 +- src/modules/m_eos.c | 2 +- src/modules/m_globops.c | 2 +- src/modules/m_help.c | 4 ++-- src/modules/m_invite.c | 2 +- src/modules/m_ison.c | 2 +- src/modules/m_join.c | 2 +- src/modules/m_kick.c | 2 +- src/modules/m_kill.c | 2 +- src/modules/m_knock.c | 2 +- src/modules/m_lag.c | 2 +- src/modules/m_links.c | 2 +- src/modules/m_list.c | 2 +- src/modules/m_locops.c | 2 +- src/modules/m_lusers.c | 2 +- src/modules/m_map.c | 2 +- src/modules/m_message.c | 4 ++-- src/modules/m_mkpasswd.c | 2 +- src/modules/m_mode.c | 4 ++-- src/modules/m_motd.c | 2 +- src/modules/m_nachat.c | 2 +- src/modules/m_names.c | 2 +- src/modules/m_netinfo.c | 2 +- src/modules/m_nick.c | 2 +- src/modules/m_nopost.c | 6 +++--- src/modules/m_oper.c | 2 +- src/modules/m_opermotd.c | 2 +- src/modules/m_part.c | 2 +- src/modules/m_pass.c | 4 ++-- src/modules/m_pingpong.c | 4 ++-- src/modules/m_protoctl.c | 2 +- src/modules/m_quit.c | 2 +- src/modules/m_rakill.c | 2 +- src/modules/m_rping.c | 4 ++-- src/modules/m_rules.c | 2 +- src/modules/m_sajoin.c | 2 +- src/modules/m_samode.c | 2 +- src/modules/m_sapart.c | 2 +- src/modules/m_sasl.c | 6 +++--- src/modules/m_sdesc.c | 2 +- src/modules/m_sendsno.c | 2 +- src/modules/m_sendumode.c | 4 ++-- src/modules/m_server.c | 2 +- src/modules/m_sethost.c | 2 +- src/modules/m_setident.c | 2 +- src/modules/m_setname.c | 2 +- src/modules/m_silence.c | 2 +- src/modules/m_sjoin.c | 2 +- src/modules/m_sqline.c | 2 +- src/modules/m_squit.c | 2 +- src/modules/m_starttls.c | 2 +- src/modules/m_stats.c | 2 +- src/modules/m_svsfline.c | 2 +- src/modules/m_svsjoin.c | 2 +- src/modules/m_svskill.c | 2 +- src/modules/m_svslusers.c | 2 +- src/modules/m_svsmode.c | 4 ++-- src/modules/m_svsmotd.c | 2 +- src/modules/m_svsnick.c | 2 +- src/modules/m_svsnline.c | 2 +- src/modules/m_svsnolag.c | 4 ++-- src/modules/m_svsnoop.c | 2 +- src/modules/m_svso.c | 2 +- src/modules/m_svspart.c | 2 +- src/modules/m_svssilence.c | 2 +- src/modules/m_svssno.c | 4 ++-- src/modules/m_svswatch.c | 2 +- src/modules/m_swhois.c | 2 +- src/modules/m_time.c | 2 +- src/modules/m_tkl.c | 16 ++++++++-------- src/modules/m_topic.c | 2 +- src/modules/m_trace.c | 2 +- src/modules/m_tsctl.c | 2 +- src/modules/m_umode2.c | 2 +- src/modules/m_undccdeny.c | 2 +- src/modules/m_unkline.c | 2 +- src/modules/m_unsqline.c | 2 +- src/modules/m_unzline.c | 2 +- src/modules/m_user.c | 2 +- src/modules/m_userhost.c | 2 +- src/modules/m_userip.c | 2 +- src/modules/m_vhost.c | 2 +- src/modules/m_wallops.c | 2 +- src/modules/m_watch.c | 2 +- src/modules/m_who.c | 2 +- src/modules/m_whois.c | 2 +- src/modules/m_whowas.c | 2 +- 107 files changed, 130 insertions(+), 131 deletions(-) diff --git a/include/modules.h b/include/modules.h index c772700e2..b5de90386 100644 --- a/include/modules.h +++ b/include/modules.h @@ -597,7 +597,7 @@ extern Callback *CallbackDel(Callback *cb); extern Efunction *EfunctionAddMain(Module *module, int eftype, int (*intfunc)(), void (*voidfunc)(), void *(*pvoidfunc)(), char *(*pcharfunc)()); extern Efunction *EfunctionDel(Efunction *cb); -Command *CommandAdd(Module *module, char *cmd, char *tok, int (*func)(), unsigned char params, int flags); +Command *CommandAdd(Module *module, char *cmd, int (*func)(), unsigned char params, int flags); void CommandDel(Command *command); int CommandExists(char *name); Cmdoverride *CmdoverrideAdd(Module *module, char *cmd, iFP function); diff --git a/src/api-command.c b/src/api-command.c index 4f895e06e..037263d8e 100644 --- a/src/api-command.c +++ b/src/api-command.c @@ -39,10 +39,10 @@ int CommandExists(char *name) return 0; } -Command *CommandAdd(Module *module, char *cmd, char *tok, int (*func)(), unsigned char params, int flags) { +Command *CommandAdd(Module *module, char *cmd, int (*func)(), unsigned char params, int flags) { Command *command; - if (find_Command_simple(cmd) || (tok && find_Command_simple(tok))) + if (find_Command_simple(cmd)) { if (module) module->errorcode = MODERR_EXISTS; @@ -50,7 +50,6 @@ Command *CommandAdd(Module *module, char *cmd, char *tok, int (*func)(), unsigne } command = MyMallocEx(sizeof(Command)); command->cmd = add_Command_backend(cmd,func,params, flags); - command->tok = NULL; command->cmd->owner = module; command->cmd->friend = NULL; if (module) { diff --git a/src/modules/m_addline.c b/src/modules/m_addline.c index f311f2e96..eb7369c52 100644 --- a/src/modules/m_addline.c +++ b/src/modules/m_addline.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_addline) DLLFUNC int MOD_INIT(m_addline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ADDLINE, TOK_ADDLINE, m_addline, 1, 0); + CommandAdd(modinfo->handle, MSG_ADDLINE, m_addline, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_addmotd.c b/src/modules/m_addmotd.c index 24876b452..623706620 100644 --- a/src/modules/m_addmotd.c +++ b/src/modules/m_addmotd.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_addmotd) DLLFUNC int MOD_INIT(m_addmotd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1, 0); + CommandAdd(modinfo->handle, MSG_ADDMOTD, m_addmotd, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_addomotd.c b/src/modules/m_addomotd.c index c3e3aab77..77fb39055 100644 --- a/src/modules/m_addomotd.c +++ b/src/modules/m_addomotd.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_addomotd) DLLFUNC int MOD_INIT(m_addomotd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1, 0); + CommandAdd(modinfo->handle, MSG_ADDOMOTD, m_addomotd, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_admin.c b/src/modules/m_admin.c index df46ff810..c768b53dc 100644 --- a/src/modules/m_admin.c +++ b/src/modules/m_admin.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_admin) DLLFUNC int MOD_INIT(m_admin)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ADMIN, TOK_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS); + CommandAdd(modinfo->handle, MSG_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_adminchat.c b/src/modules/m_adminchat.c index b190a9999..2f43c3871 100644 --- a/src/modules/m_adminchat.c +++ b/src/modules/m_adminchat.c @@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_adminchat) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_adminchat)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1, 0); + CommandAdd(modinfo->handle, MSG_ADMINCHAT, m_admins, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_akill.c b/src/modules/m_akill.c index 76f2ba3de..f0e49751e 100644 --- a/src/modules/m_akill.c +++ b/src/modules/m_akill.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_akill) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_akill)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_AKILL, TOK_AKILL, m_akill, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_AKILL, m_akill, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_away.c b/src/modules/m_away.c index 25c8d38e4..5b6a5c1ea 100644 --- a/src/modules/m_away.c +++ b/src/modules/m_away.c @@ -62,7 +62,7 @@ DLLFUNC ModuleHeader MOD_HEADER(m_away) DLLFUNC int MOD_INIT(m_away)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_AWAY, TOK_AWAY, m_away, 1, 0); + CommandAdd(modinfo->handle, MSG_AWAY, m_away, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_botmotd.c b/src/modules/m_botmotd.c index 8ed483a0f..959ba2ecb 100644 --- a/src/modules/m_botmotd.c +++ b/src/modules/m_botmotd.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_botmotd) DLLFUNC int MOD_INIT(m_botmotd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_BOTMOTD, TOK_BOTMOTD, m_botmotd, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_BOTMOTD, m_botmotd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_cap.c b/src/modules/m_cap.c index 2d512b982..e99e5f5ab 100644 --- a/src/modules/m_cap.c +++ b/src/modules/m_cap.c @@ -445,7 +445,7 @@ DLLFUNC int m_cap(aClient *cptr, aClient *sptr, int parc, char *parv[]) DLLFUNC int MOD_INIT(m_cap)(ModuleInfo *modinfo) { MARK_AS_OFFICIAL_MODULE(modinfo); - CommandAdd(modinfo->handle, MSG_CAP, TOK_CAP, m_cap, MAXPARA, M_UNREGISTERED|M_USER); + CommandAdd(modinfo->handle, MSG_CAP, m_cap, MAXPARA, M_UNREGISTERED|M_USER); return MOD_SUCCESS; } diff --git a/src/modules/m_chatops.c b/src/modules/m_chatops.c index f186f2ff5..ed14520e5 100644 --- a/src/modules/m_chatops.c +++ b/src/modules/m_chatops.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_chatops) DLLFUNC int MOD_INIT(m_chatops)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CHATOPS, TOK_CHATOPS, m_chatops, 1, 0); + CommandAdd(modinfo->handle, MSG_CHATOPS, m_chatops, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c index ae60bb687..672773219 100644 --- a/src/modules/m_chghost.c +++ b/src/modules/m_chghost.c @@ -66,7 +66,7 @@ ModuleHeader MOD_HEADER(m_chghost) DLLFUNC int MOD_INIT(m_chghost)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_CHGHOST, m_chghost, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c index 91056fca2..3fefc3fda 100644 --- a/src/modules/m_chgident.c +++ b/src/modules/m_chgident.c @@ -73,7 +73,7 @@ DLLFUNC int MOD_INIT(m_chgident)(ModuleInfo *modinfo) the module_load() will use this to add to the modules linked list */ - CommandAdd(modinfo->handle, MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_CHGIDENT, m_chgident, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c index f41ec3afb..7f10c3599 100644 --- a/src/modules/m_chgname.c +++ b/src/modules/m_chgname.c @@ -68,8 +68,8 @@ ModuleHeader MOD_HEADER(m_chgname) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2, 0); - CommandAdd(modinfo->handle, MSG_SVSNAME, NULL, m_chgname, 2, 0); + CommandAdd(modinfo->handle, MSG_CHGNAME, m_chgname, 2, 0); + CommandAdd(modinfo->handle, MSG_SVSNAME, m_chgname, 2, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_close.c b/src/modules/m_close.c index 67312a073..497f381e8 100644 --- a/src/modules/m_close.c +++ b/src/modules/m_close.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_close) DLLFUNC int MOD_INIT(m_close)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CLOSE, TOK_CLOSE, m_close, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_CLOSE, m_close, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_connect.c b/src/modules/m_connect.c index 22d5b94d6..cdf15d044 100644 --- a/src/modules/m_connect.c +++ b/src/modules/m_connect.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_connect) DLLFUNC int MOD_INIT(m_connect)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CONNECT, TOK_CONNECT, m_connect, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_CONNECT, m_connect, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_cycle.c b/src/modules/m_cycle.c index 30fa6126b..38552e9dd 100644 --- a/src/modules/m_cycle.c +++ b/src/modules/m_cycle.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_cycle) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_CYCLE, m_cycle, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_dccallow.c b/src/modules/m_dccallow.c index b91de821d..6fbdf7d8a 100644 --- a/src/modules/m_dccallow.c +++ b/src/modules/m_dccallow.c @@ -59,7 +59,7 @@ ModuleHeader MOD_HEADER(m_dccallow) DLLFUNC int MOD_INIT(m_dccallow)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_DCCALLOW, NULL, m_dccallow, 1, M_USER|M_ANNOUNCE); + CommandAdd(modinfo->handle, MSG_DCCALLOW, m_dccallow, 1, M_USER|M_ANNOUNCE); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_dccdeny.c b/src/modules/m_dccdeny.c index 1cd2adac1..67b948bb8 100644 --- a/src/modules/m_dccdeny.c +++ b/src/modules/m_dccdeny.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_dccdeny) DLLFUNC int MOD_INIT(m_dccdeny)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_DCCDENY, TOK_DCCDENY, m_dccdeny, 2, 0); + CommandAdd(modinfo->handle, MSG_DCCDENY, m_dccdeny, 2, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_dummy.c b/src/modules/m_dummy.c index 124c9e832..0453a1315 100644 --- a/src/modules/m_dummy.c +++ b/src/modules/m_dummy.c @@ -46,7 +46,7 @@ ModuleHeader MOD_HEADER(m_dummy) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_DUMMY, TOK_DUMMY, m_dummy, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_DUMMY, m_dummy, MAXPARA, 0); return MOD_SUCCESS; } diff --git a/src/modules/m_eos.c b/src/modules/m_eos.c index 5aa463e40..3eea58909 100644 --- a/src/modules/m_eos.c +++ b/src/modules/m_eos.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_eos) DLLFUNC int MOD_INIT(m_eos)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_EOS, TOK_EOS, m_eos, MAXPARA, M_SERVER); + CommandAdd(modinfo->handle, MSG_EOS, m_eos, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_globops.c b/src/modules/m_globops.c index 12d9d6f1e..43d3215f7 100644 --- a/src/modules/m_globops.c +++ b/src/modules/m_globops.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_globops) DLLFUNC int MOD_INIT(m_globops)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_GLOBOPS, TOK_GLOBOPS, m_globops, 1, 0); + CommandAdd(modinfo->handle, MSG_GLOBOPS, m_globops, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_help.c b/src/modules/m_help.c index 8e1b21c2f..9353e7d32 100644 --- a/src/modules/m_help.c +++ b/src/modules/m_help.c @@ -61,8 +61,8 @@ ModuleHeader MOD_HEADER(m_help) DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_HELP, TOK_HELP, m_help, 1, 0); - CommandAdd(modinfo->handle, MSG_HELPOP, NULL, m_help, 1, 0); + CommandAdd(modinfo->handle, MSG_HELP, m_help, 1, 0); + CommandAdd(modinfo->handle, MSG_HELPOP, m_help, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_invite.c b/src/modules/m_invite.c index eab41c439..e8bcf9e1e 100644 --- a/src/modules/m_invite.c +++ b/src/modules/m_invite.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_invite) DLLFUNC int MOD_INIT(m_invite)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_INVITE, TOK_INVITE, m_invite, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_INVITE, m_invite, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_ison.c b/src/modules/m_ison.c index 6eed52048..1732e8fbe 100644 --- a/src/modules/m_ison.c +++ b/src/modules/m_ison.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_ison) DLLFUNC int MOD_INIT(m_ison)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_ISON, TOK_ISON, m_ison, 1, 0); + CommandAdd(modinfo->handle, MSG_ISON, m_ison, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_join.c b/src/modules/m_join.c index 2f3e460f0..a2194a23b 100644 --- a/src/modules/m_join.c +++ b/src/modules/m_join.c @@ -85,7 +85,7 @@ DLLFUNC int MOD_TEST(m_join)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_join)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_JOIN, TOK_JOIN, m_join, MAXPARA, M_USER); + CommandAdd(modinfo->handle, MSG_JOIN, m_join, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_kick.c b/src/modules/m_kick.c index 07ffd7524..beeaf44c0 100644 --- a/src/modules/m_kick.c +++ b/src/modules/m_kick.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_kick) DLLFUNC int MOD_INIT(m_kick)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_KICK, TOK_KICK, m_kick, 3, 0); + CommandAdd(modinfo->handle, MSG_KICK, m_kick, 3, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c index 2630c228b..ff5aef50a 100644 --- a/src/modules/m_kill.c +++ b/src/modules/m_kill.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_kill) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_KILL, TOK_KILL, m_kill, 2, 0); + CommandAdd(modinfo->handle, MSG_KILL, m_kill, 2, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_knock.c b/src/modules/m_knock.c index a11e41cef..445902de4 100644 --- a/src/modules/m_knock.c +++ b/src/modules/m_knock.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_knock) DLLFUNC int MOD_INIT(m_knock)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_KNOCK, TOK_KNOCK, m_knock, 2, M_USER|M_ANNOUNCE); + CommandAdd(modinfo->handle, MSG_KNOCK, m_knock, 2, M_USER|M_ANNOUNCE); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c index 376b8d267..2d999cb78 100644 --- a/src/modules/m_lag.c +++ b/src/modules/m_lag.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_lag) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_LAG, TOK_LAG, m_lag, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_LAG, m_lag, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_links.c b/src/modules/m_links.c index dd074c990..439930d41 100644 --- a/src/modules/m_links.c +++ b/src/modules/m_links.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_links) DLLFUNC int MOD_INIT(m_links)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_LINKS, TOK_LINKS, m_links, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_LINKS, m_links, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_list.c b/src/modules/m_list.c index 3b663b02d..4566600e6 100644 --- a/src/modules/m_list.c +++ b/src/modules/m_list.c @@ -68,7 +68,7 @@ DLLFUNC int MOD_TEST(m_list)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_list)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_LIST, TOK_LIST, m_list, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_LIST, m_list, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_locops.c b/src/modules/m_locops.c index a8ac734f7..05551f6af 100644 --- a/src/modules/m_locops.c +++ b/src/modules/m_locops.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_locops) DLLFUNC int MOD_INIT(m_locops)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_LOCOPS, TOK_LOCOPS, m_locops, 1, 0); + CommandAdd(modinfo->handle, MSG_LOCOPS, m_locops, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_lusers.c b/src/modules/m_lusers.c index b9740b3ce..84a585b7f 100644 --- a/src/modules/m_lusers.c +++ b/src/modules/m_lusers.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_lusers) DLLFUNC int MOD_INIT(m_lusers)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_LUSERS, TOK_LUSERS, m_lusers, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_LUSERS, m_lusers, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_map.c b/src/modules/m_map.c index cd9a5a5d5..b41ca4b8a 100644 --- a/src/modules/m_map.c +++ b/src/modules/m_map.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_map) DLLFUNC int MOD_INIT(m_map)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_MAP, TOK_MAP, m_map, MAXPARA, M_USER|M_ANNOUNCE); + CommandAdd(modinfo->handle, MSG_MAP, m_map, MAXPARA, M_USER|M_ANNOUNCE); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_message.c b/src/modules/m_message.c index 4023a68b1..b7158855e 100644 --- a/src/modules/m_message.c +++ b/src/modules/m_message.c @@ -87,8 +87,8 @@ DLLFUNC int MOD_TEST(m_message)(ModuleInfo *modinfo) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_PRIVATE, TOK_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS); - CommandAdd(modinfo->handle, MSG_NOTICE, TOK_NOTICE, m_notice, 2, 0); + CommandAdd(modinfo->handle, MSG_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS); + CommandAdd(modinfo->handle, MSG_NOTICE, m_notice, 2, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c index cf778b2fb..4b03e4997 100644 --- a/src/modules/m_mkpasswd.c +++ b/src/modules/m_mkpasswd.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_mkpasswd) DLLFUNC int MOD_INIT(m_mkpasswd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_MKPASSWD, m_mkpasswd, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_mode.c b/src/modules/m_mode.c index 67fccdca9..a969e8855 100644 --- a/src/modules/m_mode.c +++ b/src/modules/m_mode.c @@ -92,8 +92,8 @@ DLLFUNC int MOD_TEST(m_mode)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_mode)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_MODE, TOK_MODE, m_mode, MAXPARA, M_USER|M_SERVER); - CommandAdd(modinfo->handle, MSG_MLOCK, TOK_MLOCK, m_mlock, MAXPARA, M_SERVER); + CommandAdd(modinfo->handle, MSG_MODE, m_mode, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_MLOCK, m_mlock, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_motd.c b/src/modules/m_motd.c index b2014b6ff..665e04b85 100644 --- a/src/modules/m_motd.c +++ b/src/modules/m_motd.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_motd) DLLFUNC int MOD_INIT(m_motd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_MOTD, TOK_MOTD, m_motd, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_MOTD, m_motd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_nachat.c b/src/modules/m_nachat.c index f2d7d9cb9..92c11e0a9 100644 --- a/src/modules/m_nachat.c +++ b/src/modules/m_nachat.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_nachat) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_nachat)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_NACHAT, TOK_NACHAT, m_nachat, 1, 0); + CommandAdd(modinfo->handle, MSG_NACHAT, m_nachat, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_names.c b/src/modules/m_names.c index 3d88e15e1..703bb1aca 100644 --- a/src/modules/m_names.c +++ b/src/modules/m_names.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_names) DLLFUNC int MOD_INIT(m_names)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_NAMES, TOK_NAMES, m_names, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_NAMES, m_names, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_netinfo.c b/src/modules/m_netinfo.c index 7852c47e4..052a0c41d 100644 --- a/src/modules/m_netinfo.c +++ b/src/modules/m_netinfo.c @@ -58,7 +58,7 @@ ModuleHeader MOD_HEADER(m_netinfo) DLLFUNC int MOD_INIT(m_netinfo)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_NETINFO, m_netinfo, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c index ec6433ebd..52c9fc323 100644 --- a/src/modules/m_nick.c +++ b/src/modules/m_nick.c @@ -68,7 +68,7 @@ DLLFUNC int MOD_TEST(m_nick)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_nick)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_NICK, TOK_NICK, m_nick, MAXPARA, M_USER|M_SERVER|M_UNREGISTERED); + CommandAdd(modinfo->handle, MSG_NICK, m_nick, MAXPARA, M_USER|M_SERVER|M_UNREGISTERED); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_nopost.c b/src/modules/m_nopost.c index bf9966161..c291ef107 100644 --- a/src/modules/m_nopost.c +++ b/src/modules/m_nopost.c @@ -82,9 +82,9 @@ DLLFUNC int MOD_TEST(m_nopost)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_nopost)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, "GET", NULL, m_nopost, MAXPARA, M_UNREGISTERED); - CommandAdd(modinfo->handle, "POST", NULL, m_nopost, MAXPARA, M_UNREGISTERED); - CommandAdd(modinfo->handle, "PUT", NULL, m_nopost, MAXPARA, M_UNREGISTERED); + CommandAdd(modinfo->handle, "GET", m_nopost, MAXPARA, M_UNREGISTERED); + CommandAdd(modinfo->handle, "POST", m_nopost, MAXPARA, M_UNREGISTERED); + CommandAdd(modinfo->handle, "PUT", m_nopost, MAXPARA, M_UNREGISTERED); HookAddEx(modinfo->handle, HOOKTYPE_CONFIGRUN, m_nopost_config_run); MARK_AS_OFFICIAL_MODULE(modinfo); init_config(); diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c index 96a015908..6100801f3 100644 --- a/src/modules/m_oper.c +++ b/src/modules/m_oper.c @@ -117,7 +117,7 @@ ModuleHeader MOD_HEADER(m_oper) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_OPER, TOK_OPER, m_oper, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_OPER, m_oper, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_opermotd.c b/src/modules/m_opermotd.c index 3c12f22d4..607dd6b3b 100644 --- a/src/modules/m_opermotd.c +++ b/src/modules/m_opermotd.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_opermotd) DLLFUNC int MOD_INIT(m_opermotd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_OPERMOTD, TOK_OPERMOTD, m_opermotd, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_OPERMOTD, m_opermotd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_part.c b/src/modules/m_part.c index a497c6d0d..b9a456137 100644 --- a/src/modules/m_part.c +++ b/src/modules/m_part.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_part) DLLFUNC int MOD_INIT(m_part)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_PART, TOK_PART, m_part, 2, M_USER); + CommandAdd(modinfo->handle, MSG_PART, m_part, 2, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_pass.c b/src/modules/m_pass.c index f7bfffa49..55375b1cd 100644 --- a/src/modules/m_pass.c +++ b/src/modules/m_pass.c @@ -68,8 +68,8 @@ ModuleHeader MOD_HEADER(m_pass) DLLFUNC int MOD_INIT(m_pass)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_PASS, TOK_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER); - CommandAdd(modinfo->handle, MSG_WEBIRC, NULL, m_webirc, MAXPARA, M_UNREGISTERED); + CommandAdd(modinfo->handle, MSG_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_WEBIRC, m_webirc, MAXPARA, M_UNREGISTERED); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c index ef9d4b754..82544938a 100644 --- a/src/modules/m_pingpong.c +++ b/src/modules/m_pingpong.c @@ -69,8 +69,8 @@ DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo) * We call our add_Command crap here */ Debug((DEBUG_NOTICE, "INIT")); - CommandAdd(modinfo->handle, MSG_PING, TOK_PING, m_ping, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS); + CommandAdd(modinfo->handle, MSG_PING, m_ping, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_protoctl.c b/src/modules/m_protoctl.c index 1d74a86a4..794a56bea 100644 --- a/src/modules/m_protoctl.c +++ b/src/modules/m_protoctl.c @@ -58,7 +58,7 @@ ModuleHeader MOD_HEADER(m_protoctl) DLLFUNC int MOD_INIT(m_protoctl)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER); + CommandAdd(modinfo->handle, MSG_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c index 670b454ef..2777a39fe 100644 --- a/src/modules/m_quit.c +++ b/src/modules/m_quit.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_quit) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS); + CommandAdd(modinfo->handle, MSG_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c index c51f47396..a0f9e0c44 100644 --- a/src/modules/m_rakill.c +++ b/src/modules/m_rakill.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_rakill) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_rakill)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_RAKILL, m_rakill, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c index 8144273e7..2a21ed3c2 100644 --- a/src/modules/m_rping.c +++ b/src/modules/m_rping.c @@ -66,8 +66,8 @@ ModuleHeader MOD_HEADER(m_rping) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_RPING, TOK_RPING, m_rping, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_RPING, m_rping, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_RPONG, m_rpong, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_rules.c b/src/modules/m_rules.c index 440968062..465d5c10e 100644 --- a/src/modules/m_rules.c +++ b/src/modules/m_rules.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_rules) DLLFUNC int MOD_INIT(m_rules)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_RULES, TOK_RULES, m_rules, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_RULES, m_rules, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sajoin.c b/src/modules/m_sajoin.c index 8da64e84d..e3b81418e 100644 --- a/src/modules/m_sajoin.c +++ b/src/modules/m_sajoin.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sajoin) DLLFUNC int MOD_INIT(m_sajoin)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SAJOIN, m_sajoin, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_samode.c b/src/modules/m_samode.c index e74de8ddd..805a8dfd3 100644 --- a/src/modules/m_samode.c +++ b/src/modules/m_samode.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_samode) DLLFUNC int MOD_INIT(m_samode)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SAMODE, TOK_SAMODE, m_samode, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SAMODE, m_samode, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sapart.c b/src/modules/m_sapart.c index 0ac9a59bf..49797bf0b 100644 --- a/src/modules/m_sapart.c +++ b/src/modules/m_sapart.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sapart) DLLFUNC int MOD_INIT(m_sapart)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SAPART, TOK_SAPART, m_sapart, 3, 0); + CommandAdd(modinfo->handle, MSG_SAPART, m_sapart, 3, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sasl.c b/src/modules/m_sasl.c index 9c70c7b3a..b258421a2 100644 --- a/src/modules/m_sasl.c +++ b/src/modules/m_sasl.c @@ -312,9 +312,9 @@ DLLFUNC int MOD_INIT(m_sasl)(ModuleInfo *modinfo) { MARK_AS_OFFICIAL_MODULE(modinfo); - CommandAdd(modinfo->handle, MSG_SASL, TOK_SASL, m_sasl, MAXPARA, M_USER|M_SERVER); - CommandAdd(modinfo->handle, MSG_SVSLOGIN, TOK_SVSLOGIN, m_svslogin, MAXPARA, M_USER|M_SERVER); - CommandAdd(modinfo->handle, MSG_AUTHENTICATE, TOK_AUTHENTICATE, m_authenticate, MAXPARA, M_UNREGISTERED); + CommandAdd(modinfo->handle, MSG_SASL, m_sasl, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SVSLOGIN, m_svslogin, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_AUTHENTICATE, m_authenticate, MAXPARA, M_UNREGISTERED); HookAddEx(modinfo->handle, HOOKTYPE_LOCAL_CONNECT, abort_sasl); HookAddEx(modinfo->handle, HOOKTYPE_LOCAL_QUIT, abort_sasl); diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c index f09b53b63..eee47c975 100644 --- a/src/modules/m_sdesc.c +++ b/src/modules/m_sdesc.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_sdesc) DLLFUNC int MOD_INIT(m_sdesc)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SDESC, TOK_SDESC, m_sdesc, 1, 0); + CommandAdd(modinfo->handle, MSG_SDESC, m_sdesc, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sendsno.c b/src/modules/m_sendsno.c index cff357c33..ce8b4ca92 100644 --- a/src/modules/m_sendsno.c +++ b/src/modules/m_sendsno.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_sendsno) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_sendsno)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SENDSNO, TOK_SENDSNO, m_sendsno, MAXPARA, M_SERVER); + CommandAdd(modinfo->handle, MSG_SENDSNO, m_sendsno, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c index f9ca3e01c..8d0b97864 100644 --- a/src/modules/m_sendumode.c +++ b/src/modules/m_sendumode.c @@ -63,8 +63,8 @@ ModuleHeader MOD_HEADER(m_sendumode) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_SMO, TOK_SMO, m_sendumode, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SENDUMODE, m_sendumode, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SMO, m_sendumode, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_server.c b/src/modules/m_server.c index c2f5f268e..f0625bcf6 100644 --- a/src/modules/m_server.c +++ b/src/modules/m_server.c @@ -76,7 +76,7 @@ DLLFUNC int MOD_TEST(m_server)(ModuleInfo *modinfo) DLLFUNC int MOD_INIT(m_server)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SERVER, TOK_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER); + CommandAdd(modinfo->handle, MSG_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c index ce0fd4fc0..9858c9013 100644 --- a/src/modules/m_sethost.c +++ b/src/modules/m_sethost.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_sethost) DLLFUNC int MOD_INIT(m_sethost)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SETHOST, m_sethost, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c index 1806e6fa3..e9ae22e18 100644 --- a/src/modules/m_setident.c +++ b/src/modules/m_setident.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_setident) DLLFUNC int MOD_INIT(m_setident)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SETIDENT, m_setident, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c index d85217575..c2568c076 100644 --- a/src/modules/m_setname.c +++ b/src/modules/m_setname.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_setname) DLLFUNC int MOD_INIT(m_setname)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SETNAME, TOK_SETNAME, m_setname, 1, 0); + CommandAdd(modinfo->handle, MSG_SETNAME, m_setname, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_silence.c b/src/modules/m_silence.c index 416101075..d2d725d1d 100644 --- a/src/modules/m_silence.c +++ b/src/modules/m_silence.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_silence) DLLFUNC int MOD_INIT(m_silence)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SILENCE, TOK_SILENCE, m_silence, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SILENCE, m_silence, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sjoin.c b/src/modules/m_sjoin.c index 07761799f..2d8fb5a6e 100644 --- a/src/modules/m_sjoin.c +++ b/src/modules/m_sjoin.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sjoin) DLLFUNC int MOD_INIT(m_sjoin)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SJOIN, m_sjoin, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c index f32fde94f..0339349bd 100644 --- a/src/modules/m_sqline.c +++ b/src/modules/m_sqline.c @@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_sqline) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SQLINE, m_sqline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_squit.c b/src/modules/m_squit.c index ee227d914..597e5e3c0 100644 --- a/src/modules/m_squit.c +++ b/src/modules/m_squit.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_squit) DLLFUNC int MOD_INIT(m_squit)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SQUIT, TOK_SQUIT, m_squit, 2, 0); + CommandAdd(modinfo->handle, MSG_SQUIT, m_squit, 2, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_starttls.c b/src/modules/m_starttls.c index 1cc1f082f..baa4f55ad 100644 --- a/src/modules/m_starttls.c +++ b/src/modules/m_starttls.c @@ -59,7 +59,7 @@ ModuleHeader MOD_HEADER(m_starttls) DLLFUNC int MOD_INIT(m_starttls)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_STARTTLS, NULL, m_starttls, MAXPARA, M_UNREGISTERED|M_ANNOUNCE); + CommandAdd(modinfo->handle, MSG_STARTTLS, m_starttls, MAXPARA, M_UNREGISTERED|M_ANNOUNCE); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_stats.c b/src/modules/m_stats.c index 12cd9e29c..7e0196810 100644 --- a/src/modules/m_stats.c +++ b/src/modules/m_stats.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_stats) DLLFUNC int MOD_INIT(m_stats)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_STATS, TOK_STATS, m_stats, 3, 0); + CommandAdd(modinfo->handle, MSG_STATS, m_stats, 3, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsfline.c b/src/modules/m_svsfline.c index 1b34ef68f..01fb9d59a 100644 --- a/src/modules/m_svsfline.c +++ b/src/modules/m_svsfline.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_svsfline) DLLFUNC int MOD_INIT(m_svsfline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSFLINE, m_svsfline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsjoin.c b/src/modules/m_svsjoin.c index fe44bfa86..1127d81a7 100644 --- a/src/modules/m_svsjoin.c +++ b/src/modules/m_svsjoin.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svsjoin) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svsjoin)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSJOIN, m_svsjoin, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svskill.c b/src/modules/m_svskill.c index 0988a4d38..60e4f2638 100644 --- a/src/modules/m_svskill.c +++ b/src/modules/m_svskill.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svskill) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svskill)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSKILL, TOK_SVSKILL, m_svskill, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSKILL, m_svskill, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svslusers.c b/src/modules/m_svslusers.c index b4353b8dd..30bf328b9 100644 --- a/src/modules/m_svslusers.c +++ b/src/modules/m_svslusers.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svslusers) DLLFUNC int MOD_INIT(m_svslusers)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSLUSERS, m_svslusers, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c index a4336f227..fdbbeb9f6 100644 --- a/src/modules/m_svsmode.c +++ b/src/modules/m_svsmode.c @@ -66,8 +66,8 @@ ModuleHeader MOD_HEADER(m_svsmode) DLLFUNC int MOD_INIT(m_svsmode)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSMODE, m_svsmode, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVS2MODE, m_svs2mode, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c index a82240c2f..33994fb19 100644 --- a/src/modules/m_svsmotd.c +++ b/src/modules/m_svsmotd.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_svsmotd) DLLFUNC int MOD_INIT(m_svsmotd)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSMOTD, m_svsmotd, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c index acbfa74c0..2bceefa72 100644 --- a/src/modules/m_svsnick.c +++ b/src/modules/m_svsnick.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_svsnick) DLLFUNC int MOD_INIT(m_svsnick)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSNICK, m_svsnick, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsnline.c b/src/modules/m_svsnline.c index 75f9478ee..b5c8baa9d 100644 --- a/src/modules/m_svsnline.c +++ b/src/modules/m_svsnline.c @@ -64,7 +64,7 @@ ModuleHeader MOD_HEADER(m_svsnline) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svsnline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSNLINE, m_svsnline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsnolag.c b/src/modules/m_svsnolag.c index 49c862902..d59af64aa 100644 --- a/src/modules/m_svsnolag.c +++ b/src/modules/m_svsnolag.c @@ -62,8 +62,8 @@ ModuleHeader MOD_HEADER(m_svsnolag) DLLFUNC int MOD_INIT(m_svsnolag)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSNOLAG, m_svsnolag, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVS2NOLAG, m_svs2nolag, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svsnoop.c b/src/modules/m_svsnoop.c index 39bd5132c..185d0db60 100644 --- a/src/modules/m_svsnoop.c +++ b/src/modules/m_svsnoop.c @@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_svsnoop) DLLFUNC int MOD_INIT(m_svsnoop)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSNOOP, m_svsnoop, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svso.c b/src/modules/m_svso.c index 9d77029ae..52cd9c8be 100644 --- a/src/modules/m_svso.c +++ b/src/modules/m_svso.c @@ -100,7 +100,7 @@ ModuleHeader MOD_HEADER(m_svso) DLLFUNC int MOD_INIT(m_svso)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSO, TOK_SVSO, m_svso, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSO, m_svso, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svspart.c b/src/modules/m_svspart.c index cbb1ca7a7..6af8ea562 100644 --- a/src/modules/m_svspart.c +++ b/src/modules/m_svspart.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svspart) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svspart)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSPART, TOK_SVSPART, m_svspart, 3, 0); + CommandAdd(modinfo->handle, MSG_SVSPART, m_svspart, 3, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svssilence.c b/src/modules/m_svssilence.c index c840855c0..e917be268 100644 --- a/src/modules/m_svssilence.c +++ b/src/modules/m_svssilence.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svssilence) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svssilence)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSSILENCE, m_svssilence, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svssno.c b/src/modules/m_svssno.c index a9e05b767..eb57b2c31 100644 --- a/src/modules/m_svssno.c +++ b/src/modules/m_svssno.c @@ -63,8 +63,8 @@ ModuleHeader MOD_HEADER(m_svssno) DLLFUNC int MOD_INIT(m_svssno)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSSNO, TOK_SVSSNO, m_svssno, MAXPARA, 0); - CommandAdd(modinfo->handle, MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSSNO, m_svssno, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVS2SNO, m_svs2sno, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_svswatch.c b/src/modules/m_svswatch.c index 29f8a975d..0858b691b 100644 --- a/src/modules/m_svswatch.c +++ b/src/modules/m_svswatch.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svswatch) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_svswatch)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SVSWATCH, m_svswatch, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c index e164a0c74..37f677c7f 100644 --- a/src/modules/m_swhois.c +++ b/src/modules/m_swhois.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_swhois) DLLFUNC int MOD_INIT(m_swhois)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_SWHOIS, m_swhois, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_time.c b/src/modules/m_time.c index e8e474f08..51a10f30a 100644 --- a/src/modules/m_time.c +++ b/src/modules/m_time.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_time) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_time)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_TIME, TOK_TIME, m_time, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_TIME, m_time, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c index 8e73aca11..cb0025d01 100644 --- a/src/modules/m_tkl.c +++ b/src/modules/m_tkl.c @@ -161,14 +161,14 @@ DLLFUNC int MOD_INIT(m_tkl)(ModuleInfo *modinfo) /* * We call our add_Command crap here */ - CommandAdd(modinfo->handle, MSG_GLINE, TOK_GLINE, m_gline, 3, M_OPER); - CommandAdd(modinfo->handle, MSG_SHUN, TOK_SHUN, m_shun, 3, M_OPER); - CommandAdd(modinfo->handle, MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun, 2, M_OPER); - CommandAdd(modinfo->handle, MSG_ZLINE, TOK_NONE, m_tzline, 3, M_OPER); - CommandAdd(modinfo->handle, MSG_KLINE, TOK_NONE, m_tkline, 3, M_OPER); - CommandAdd(modinfo->handle, MSG_GZLINE, TOK_NONE, m_gzline, 3, M_OPER); - CommandAdd(modinfo->handle, MSG_SPAMFILTER, TOK_NONE, m_spamfilter, 6, M_OPER); - CommandAdd(modinfo->handle, MSG_TKL, TOK_TKL, _m_tkl, MAXPARA, M_OPER|M_SERVER); + CommandAdd(modinfo->handle, MSG_GLINE, m_gline, 3, M_OPER); + CommandAdd(modinfo->handle, MSG_SHUN, m_shun, 3, M_OPER); + CommandAdd(modinfo->handle, MSG_TEMPSHUN, m_tempshun, 2, M_OPER); + CommandAdd(modinfo->handle, MSG_ZLINE, m_tzline, 3, M_OPER); + CommandAdd(modinfo->handle, MSG_KLINE, m_tkline, 3, M_OPER); + CommandAdd(modinfo->handle, MSG_GZLINE, m_gzline, 3, M_OPER); + CommandAdd(modinfo->handle, MSG_SPAMFILTER, m_spamfilter, 6, M_OPER); + CommandAdd(modinfo->handle, MSG_TKL, _m_tkl, MAXPARA, M_OPER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_topic.c b/src/modules/m_topic.c index 7b321414e..e31ec4a6d 100644 --- a/src/modules/m_topic.c +++ b/src/modules/m_topic.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_topic) DLLFUNC int MOD_INIT(m_topic)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_TOPIC, TOK_TOPIC, m_topic, 4, 0); + CommandAdd(modinfo->handle, MSG_TOPIC, m_topic, 4, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_trace.c b/src/modules/m_trace.c index 6b6d1ed6b..f80d7c214 100644 --- a/src/modules/m_trace.c +++ b/src/modules/m_trace.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_trace) DLLFUNC int MOD_INIT(m_trace)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_TRACE, TOK_TRACE, m_trace, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_TRACE, m_trace, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c index c811fa25e..36c36511e 100644 --- a/src/modules/m_tsctl.c +++ b/src/modules/m_tsctl.c @@ -64,7 +64,7 @@ DLLFUNC int MOD_INIT(m_tsctl)(ModuleInfo *modinfo) /* * We call our add_Command crap here */ - CommandAdd(modinfo->handle, MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_TSCTL, m_tsctl, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_umode2.c b/src/modules/m_umode2.c index 3278cc5d2..2e762f339 100644 --- a/src/modules/m_umode2.c +++ b/src/modules/m_umode2.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_umode2) DLLFUNC int MOD_INIT(m_umode2)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_UMODE2, TOK_UMODE2, m_umode2, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_UMODE2, m_umode2, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_undccdeny.c b/src/modules/m_undccdeny.c index d02d60f48..dbda49c7f 100644 --- a/src/modules/m_undccdeny.c +++ b/src/modules/m_undccdeny.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_undccdeny) DLLFUNC int MOD_INIT(m_undccdeny)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_UNDCCDENY, m_undccdeny, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c index eff8852fb..e7260f438 100644 --- a/src/modules/m_unkline.c +++ b/src/modules/m_unkline.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_unkline) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_unkline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_UNKLINE, m_unkline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c index 59b0157e0..e6fa79229 100644 --- a/src/modules/m_unsqline.c +++ b/src/modules/m_unsqline.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_unsqline) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_unsqline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_UNSQLINE, m_unsqline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c index 6c43c69ed..d7e0cfdcf 100644 --- a/src/modules/m_unzline.c +++ b/src/modules/m_unzline.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_unzline) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_unzline)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_UNZLINE, m_unzline, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_user.c b/src/modules/m_user.c index c9a83ccfc..333d60b5c 100644 --- a/src/modules/m_user.c +++ b/src/modules/m_user.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_user) DLLFUNC int MOD_INIT(m_user)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_USER, TOK_USER, m_user, 4, M_USER|M_UNREGISTERED); + CommandAdd(modinfo->handle, MSG_USER, m_user, 4, M_USER|M_UNREGISTERED); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_userhost.c b/src/modules/m_userhost.c index b2db90d42..84f96b1a5 100644 --- a/src/modules/m_userhost.c +++ b/src/modules/m_userhost.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_userhost) DLLFUNC int MOD_INIT(m_userhost)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_USERHOST, TOK_USERHOST, m_userhost, 1, 0); + CommandAdd(modinfo->handle, MSG_USERHOST, m_userhost, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_userip.c b/src/modules/m_userip.c index 22de58c94..a5b90530a 100644 --- a/src/modules/m_userip.c +++ b/src/modules/m_userip.c @@ -59,7 +59,7 @@ ModuleHeader MOD_HEADER(m_userip) DLLFUNC int MOD_INIT(m_userip)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_USERIP, NULL, m_userip, 1, M_USER|M_ANNOUNCE); + CommandAdd(modinfo->handle, MSG_USERIP, m_userip, 1, M_USER|M_ANNOUNCE); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_vhost.c b/src/modules/m_vhost.c index 0c8d2bb6e..da46143bf 100644 --- a/src/modules/m_vhost.c +++ b/src/modules/m_vhost.c @@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_vhost) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_vhost)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_VHOST, m_vhost, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_wallops.c b/src/modules/m_wallops.c index b869bab9d..a2eb00976 100644 --- a/src/modules/m_wallops.c +++ b/src/modules/m_wallops.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_wallops) DLLFUNC int MOD_INIT(m_wallops)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_WALLOPS, TOK_WALLOPS, m_wallops, 1, 0); + CommandAdd(modinfo->handle, MSG_WALLOPS, m_wallops, 1, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_watch.c b/src/modules/m_watch.c index 9efc78aa8..82ce04606 100644 --- a/src/modules/m_watch.c +++ b/src/modules/m_watch.c @@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_watch) DLLFUNC int MOD_INIT(m_watch)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_WATCH, TOK_WATCH, m_watch, 1, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_WATCH, m_watch, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_who.c b/src/modules/m_who.c index acf47f5d3..1ed9cfa34 100644 --- a/src/modules/m_who.c +++ b/src/modules/m_who.c @@ -68,7 +68,7 @@ ModuleHeader MOD_HEADER(m_who) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_who)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_WHO, TOK_WHO, m_who, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_WHO, m_who, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c index 9304d13d2..8d9d72542 100644 --- a/src/modules/m_whois.c +++ b/src/modules/m_whois.c @@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_whois) /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_whois)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_WHOIS, m_whois, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } diff --git a/src/modules/m_whowas.c b/src/modules/m_whowas.c index c0acc75cd..1c34125ba 100644 --- a/src/modules/m_whowas.c +++ b/src/modules/m_whowas.c @@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_whowas) DLLFUNC int MOD_INIT(m_whowas)(ModuleInfo *modinfo) { - CommandAdd(modinfo->handle, MSG_WHOWAS, TOK_WHOWAS, m_whowas, MAXPARA, 0); + CommandAdd(modinfo->handle, MSG_WHOWAS, m_whowas, MAXPARA, 0); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; }