--- src/modules/l_commands.c 2007-04-16 13:05:48.000000000 -0400 +++ src/modules/l_commands.c 2007-04-26 05:44:28.000000000 -0400 @@ -243,7 +243,7 @@ Module p; #endif /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ module_load = ModCmdsInfo->module_load; m_sethost_Init(ModCmdsInfo); --- src/modules/m_addmotd.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_addmotd.c 2007-04-26 05:42:41.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_addmotd)(ModuleInfo *modinfo) { - add_Command(MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1); + CommandAdd(modinfo->handle, MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_addmotd)(int module_unload) { - if (del_Command(MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_addmotd).name); - } return MOD_SUCCESS; } --- src/modules/m_addomotd.c 2007-04-15 18:21:10.000000000 -0400 +++ src/modules/m_addomotd.c 2007-04-26 05:49:06.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_addomotd)(ModuleInfo *modinfo) { - add_Command(MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1); + CommandAdd(modinfo->handle, MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_addomotd)(int module_unload) { - if (del_Command(MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_addomotd).name); - } return MOD_SUCCESS; } --- src/modules/m_admin.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_admin.c 2007-04-26 06:00:20.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_admin)(ModuleInfo *modinfo) { - add_CommandX(MSG_ADMIN, TOK_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS); + CommandAdd(modinfo->handle, MSG_ADMIN, TOK_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_admin)(int module_unload) { - if (del_Command(MSG_ADMIN, TOK_ADMIN, m_admin) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_admin).name); - } return MOD_SUCCESS; } --- src/modules/m_adminchat.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_adminchat.c 2007-04-26 05:23:22.000000000 -0400 @@ -64,9 +64,9 @@ DLLFUNC int MOD_INIT(m_adminchat)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1); + Command(modinfo->handle, MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -81,11 +81,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_adminchat)(int module_unload) { - if (del_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_adminchat).name); - } return MOD_SUCCESS; } --- src/modules/m_akill.c 2003-11-11 15:20:21.000000000 -0500 +++ src/modules/m_akill.c 2007-04-26 05:28:24.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_akill)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_AKILL, TOK_AKILL, m_akill, MAXPARA); + CommandAdd(modinfo->handle, MSG_AKILL, TOK_AKILL, m_akill, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_akill)(int module_unload) { - if (del_Command(MSG_AKILL, TOK_AKILL, m_akill) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_akill).name); - } return MOD_SUCCESS; } --- src/modules/m_away.c 2006-10-28 10:19:48.000000000 -0400 +++ src/modules/m_away.c 2007-04-26 05:34:54.000000000 -0400 @@ -62,7 +62,7 @@ DLLFUNC int MOD_INIT(m_away)(ModuleInfo *modinfo) { - add_Command(MSG_AWAY, TOK_AWAY, m_away, 1); + CommandAdd(modinfo->handle, MSG_AWAY, TOK_AWAY, m_away, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -74,11 +74,6 @@ DLLFUNC int MOD_UNLOAD(m_away)(int module_unload) { - if (del_Command(MSG_AWAY, TOK_AWAY, m_away) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_away).name); - } return MOD_SUCCESS; } /*********************************************************************** --- src/modules/m_chatops.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_chatops.c 2007-04-26 05:27:35.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_chatops)(ModuleInfo *modinfo) { - add_Command(MSG_CHATOPS, TOK_CHATOPS, m_chatops, 1); + CommandAdd(modinfo->handle, MSG_CHATOPS, TOK_CHATOPS, m_chatops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_chatops)(int module_unload) { - if (del_Command(MSG_CHATOPS, TOK_CHATOPS, m_chatops) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_chatops).name); - } return MOD_SUCCESS; } --- src/modules/m_chghost.c 2007-04-24 05:03:26.000000000 -0400 +++ src/modules/m_chghost.c 2007-04-26 06:13:45.000000000 -0400 @@ -67,9 +67,9 @@ DLLFUNC int MOD_INIT(m_chghost)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA); + CommandAdd(modinfo->handle, MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -82,11 +82,6 @@ DLLFUNC int MOD_UNLOAD(m_chghost)(int module_unload) { - if (del_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_chghost).name); - } return MOD_SUCCESS; } --- src/modules/m_chgident.c 2007-04-24 05:03:26.000000000 -0400 +++ src/modules/m_chgident.c 2007-04-26 06:17:46.000000000 -0400 @@ -74,9 +74,9 @@ list */ /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA); + CommandAdd(modinfo->handle, MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -88,11 +88,6 @@ DLLFUNC int MOD_UNLOAD(m_chgident)(int module_unload) { - if (del_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_chgident).name); - } return MOD_SUCCESS; } --- src/modules/m_chgname.c 2007-04-24 05:03:26.000000000 -0400 +++ src/modules/m_chgname.c 2007-04-26 06:11:37.000000000 -0400 @@ -69,10 +69,10 @@ DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here - */ - add_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2); - add_Command(MSG_SVSNAME, NULL, m_chgname, 2); + * We call our CommandAdd crap here + */ + CommandAdd(modinfo->handle, MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SVSNAME, NULL, m_chgname, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -88,18 +88,7 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_chgname)(int module_unload) { - if (del_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname) < 0) - { - sendto_realops("Failed to delete command chgname when unloading %s", - MOD_HEADER(m_chgname).name); - } - if (del_Command(MSG_SVSNAME, NULL, m_chgname) < 0) - { - sendto_realops("Failed to delete command svsname when unloading %s", - MOD_HEADER(m_chgname).name); - } return MOD_SUCCESS; - } --- src/modules/m_close.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_close.c 2007-04-26 06:17:24.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_close)(ModuleInfo *modinfo) { - add_Command(MSG_CLOSE, TOK_CLOSE, m_close, MAXPARA); + CommandAdd(modinfo->handle, MSG_CLOSE, TOK_CLOSE, m_close, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_close)(int module_unload) { - if (del_Command(MSG_CLOSE, TOK_CLOSE, m_close) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_close).name); - } return MOD_SUCCESS; } --- src/modules/m_connect.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_connect.c 2007-04-26 06:15:46.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_connect)(ModuleInfo *modinfo) { - add_Command(MSG_CONNECT, TOK_CONNECT, m_connect, MAXPARA); + CommandAdd(modinfo->handle, MSG_CONNECT, TOK_CONNECT, m_connect, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_connect)(int module_unload) { - if (del_Command(MSG_CONNECT, TOK_CONNECT, m_connect) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_connect).name); - } return MOD_SUCCESS; } --- src/modules/m_cycle.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_cycle.c 2007-04-26 06:20:12.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA); + CommandAdd(modinfo->handle, MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_cycle)(int module_unload) { - if (del_Command(MSG_CYCLE, TOK_CYCLE, m_cycle) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_cycle).name); - } return MOD_SUCCESS; } --- src/modules/m_dccdeny.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_dccdeny.c 2007-04-26 06:15:59.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_dccdeny)(ModuleInfo *modinfo) { - add_Command(MSG_DCCDENY, TOK_DCCDENY, m_dccdeny, 2); + CommandAdd(modinfo->handle, MSG_DCCDENY, TOK_DCCDENY, m_dccdeny, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_dccdeny)(int module_unload) { - if (del_Command(MSG_DCCDENY, TOK_DCCDENY, m_dccdeny) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_dccdeny).name); - } return MOD_SUCCESS; } --- src/modules/m_dummy.c 2003-09-21 15:59:49.000000000 -0400 +++ src/modules/m_dummy.c 2007-04-26 06:01:24.000000000 -0400 @@ -47,9 +47,9 @@ DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_DUMMY, TOK_DUMMY, m_dummy, MAXPARA); + CommandAdd(modinfo->handle, MSG_DUMMY, TOK_DUMMY, m_dummy, MAXPARA, M_USER|M_SERVER); return MOD_SUCCESS; } @@ -63,11 +63,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_dummy)(int module_unload) { - if (del_Command(MSG_DUMMY, TOK_DUMMY, m_dummy) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_dummy).name); - } return MOD_SUCCESS; } --- src/modules/m_eos.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_eos.c 2007-04-26 05:33:24.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_eos)(ModuleInfo *modinfo) { - add_CommandX(MSG_EOS, TOK_EOS, m_eos, MAXPARA, M_SERVER); + CommandAdd(modinfo->handle, MSG_EOS, TOK_EOS, m_eos, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_eos)(int module_unload) { - if (del_Command(MSG_EOS, TOK_EOS, m_eos) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_eos).name); - } return MOD_SUCCESS; } --- src/modules/m_globops.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_globops.c 2007-04-26 06:00:36.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_globops)(ModuleInfo *modinfo) { - add_Command(MSG_GLOBOPS, TOK_GLOBOPS, m_globops, 1); + CommandAdd(modinfo->handle, MSG_GLOBOPS, TOK_GLOBOPS, m_globops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_globops)(int module_unload) { - if (del_Command(MSG_GLOBOPS, TOK_GLOBOPS, m_globops) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_globops).name); - } return MOD_SUCCESS; } --- src/modules/m_guest.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_guest.c 2007-04-26 06:10:52.000000000 -0400 @@ -63,7 +63,7 @@ DLLFUNC int MOD_INIT(m_guest)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ #ifdef GUEST ModGuestInfo = modinfo; --- src/modules/m_help.c 2007-04-24 06:53:20.000000000 -0400 +++ src/modules/m_help.c 2007-04-26 05:41:44.000000000 -0400 @@ -61,8 +61,8 @@ DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo) { - add_Command(MSG_HELP, TOK_HELP, m_help, 1); - add_Command(MSG_HELPOP, NULL, m_help, 1); + CommandAdd(modinfo->handle, MSG_HELP, TOK_HELP, m_help, 1, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_HELPOP, NULL, m_help, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -74,16 +74,6 @@ DLLFUNC int MOD_UNLOAD(m_help)(int module_unload) { - if (del_Command(MSG_HELP, TOK_HELP, m_help) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_help).name); - } - if (del_Command(MSG_HELPOP, NULL, m_help) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_help).name); - } return MOD_SUCCESS; } --- src/modules/m_htm.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_htm.c 2007-04-26 05:32:56.000000000 -0400 @@ -72,7 +72,7 @@ DLLFUNC int MOD_TEST(m_htm)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ HtmModInfo = modinfo; ConfTest = HookAddEx(HtmModInfo->handle, HOOKTYPE_CONFIGTEST, htm_config_test); @@ -84,9 +84,9 @@ DLLFUNC int MOD_INIT(m_htm)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_HTM, TOK_HTM, m_htm, MAXPARA); + CommandAdd(modinfo->handle, MSG_HTM, TOK_HTM, m_htm, MAXPARA, M_USER|M_SERVER); ConfRun = HookAddEx(HtmModInfo->handle, HOOKTYPE_CONFIGRUN, htm_config_run); ServerStats = HookAddEx(HtmModInfo->handle, HOOKTYPE_STATS, htm_stats); #ifndef NO_FDLIST @@ -109,11 +109,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_htm)(int module_unload) { - if (del_Command(MSG_HTM, TOK_HTM, m_htm) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_htm).name); - } #ifndef NO_FDLIST LockEventSystem(); EventDel(e_lcf); --- src/modules/m_invite.c 2007-04-25 13:37:05.000000000 -0400 +++ src/modules/m_invite.c 2007-04-26 06:14:23.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_invite)(ModuleInfo *modinfo) { - add_Command(MSG_INVITE, TOK_INVITE, m_invite, MAXPARA); + CommandAdd(modinfo->handle, MSG_INVITE, TOK_INVITE, m_invite, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_invite)(int module_unload) { - if (del_Command(MSG_INVITE, TOK_INVITE, m_invite) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_invite).name); - } return MOD_SUCCESS; } --- src/modules/m_ison.c 2006-08-17 11:29:41.000000000 -0400 +++ src/modules/m_ison.c 2007-04-26 05:39:03.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_ison)(ModuleInfo *modinfo) { - add_Command(MSG_ISON, TOK_ISON, m_ison, 1); + CommandAdd(modinfo->handle, MSG_ISON, TOK_ISON, m_ison, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_ison)(int module_unload) { - if (del_Command(MSG_ISON, TOK_ISON, m_ison) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_ison).name); - } return MOD_SUCCESS; } --- src/modules/m_kick.c 2007-04-25 13:37:05.000000000 -0400 +++ src/modules/m_kick.c 2007-04-26 05:36:57.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_kick)(ModuleInfo *modinfo) { - add_Command(MSG_KICK, TOK_KICK, m_kick, 3); + CommandAdd(modinfo->handle, MSG_KICK, TOK_KICK, m_kick, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_kick)(int module_unload) { - if (del_Command(MSG_KICK, TOK_KICK, m_kick) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_kick).name); - } return MOD_SUCCESS; } --- src/modules/m_kill.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_kill.c 2007-04-26 06:11:57.000000000 -0400 @@ -63,9 +63,9 @@ DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_KILL, TOK_KILL, m_kill, 2); + CommandAdd(modinfo->handle, MSG_KILL, TOK_KILL, m_kill, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -80,11 +80,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_kill)(int module_unload) { - if (del_Command(MSG_KILL, TOK_KILL, m_kill) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_kill).name); - } return MOD_SUCCESS; } --- src/modules/m_lag.c 2003-11-11 15:20:21.000000000 -0500 +++ src/modules/m_lag.c 2007-04-26 06:00:06.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_LAG, TOK_LAG, m_lag, MAXPARA); + CommandAdd(modinfo->handle, MSG_LAG, TOK_LAG, m_lag, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,13 +78,7 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_lag)(int module_unload) { - if (del_Command(MSG_LAG, TOK_LAG, m_lag) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_lag).name); - } return MOD_SUCCESS; - } /* m_lag (lag measure) - Stskeeps --- src/modules/m_links.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_links.c 2007-04-26 05:48:24.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_links)(ModuleInfo *modinfo) { - add_Command(MSG_LINKS, TOK_LINKS, m_links, MAXPARA); + CommandAdd(modinfo->handle, MSG_LINKS, TOK_LINKS, m_links, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_links)(int module_unload) { - if (del_Command(MSG_LINKS, TOK_LINKS, m_links) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_links).name); - } return MOD_SUCCESS; } --- src/modules/m_list.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_list.c 2007-04-26 05:43:57.000000000 -0400 @@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_list)(ModuleInfo *modinfo) { - add_Command(MSG_LIST, TOK_LIST, m_list, MAXPARA); + CommandAdd(modinfo->handle, MSG_LIST, TOK_LIST, m_list, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -80,11 +80,6 @@ DLLFUNC int MOD_UNLOAD(m_list)(int module_unload) { - if (del_Command(MSG_LIST, TOK_LIST, m_list) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_list).name); - } return MOD_SUCCESS; } --- src/modules/m_locops.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_locops.c 2007-04-26 05:48:43.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_locops)(ModuleInfo *modinfo) { - add_Command(MSG_LOCOPS, TOK_LOCOPS, m_locops, 1); + CommandAdd(modinfo->handle, MSG_LOCOPS, TOK_LOCOPS, m_locops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_locops)(int module_unload) { - if (del_Command(MSG_LOCOPS, TOK_LOCOPS, m_locops) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_locops).name); - } return MOD_SUCCESS; } --- src/modules/m_message.c 2007-04-24 07:04:07.000000000 -0400 +++ src/modules/m_message.c 2007-04-26 05:47:22.000000000 -0400 @@ -85,10 +85,10 @@ DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_CommandX(MSG_PRIVATE, TOK_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS); - add_Command(MSG_NOTICE, TOK_NOTICE, m_notice, 2); + 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, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; @@ -103,16 +103,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_message)(int module_unload) { - if (del_Command(MSG_PRIVATE, TOK_PRIVATE, m_private) < 0) - { - sendto_realops("Failed to delete command privmsg when unloading %s", - MOD_HEADER(m_message).name); - } - if (del_Command(MSG_NOTICE, TOK_NOTICE, m_notice) < 0) - { - sendto_realops("Failed to delete command notice when unloading %s", - MOD_HEADER(m_message).name); - } return MOD_SUCCESS; } --- src/modules/m_mkpasswd.c 2006-11-04 18:54:54.000000000 -0500 +++ src/modules/m_mkpasswd.c 2007-04-26 06:14:48.000000000 -0400 @@ -62,7 +62,7 @@ DLLFUNC int MOD_INIT(m_mkpasswd)(ModuleInfo *modinfo) { - add_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA); + CommandAdd(modinfo->handle, MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -74,11 +74,6 @@ DLLFUNC int MOD_UNLOAD(m_mkpasswd)(int module_unload) { - if (del_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_mkpasswd).name); - } return MOD_SUCCESS; } --- src/modules/m_nachat.c 2003-11-11 15:20:21.000000000 -0500 +++ src/modules/m_nachat.c 2007-04-26 06:19:54.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_nachat)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_NACHAT, TOK_NACHAT, m_nachat, 1); + CommandAdd(modinfo->handle, MSG_NACHAT, TOK_NACHAT, m_nachat, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_nachat)(int module_unload) { - if (del_Command(MSG_NACHAT, TOK_NACHAT, m_nachat) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_nachat).name); - } return MOD_SUCCESS; } --- src/modules/m_netinfo.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_netinfo.c 2007-04-26 06:13:29.000000000 -0400 @@ -58,7 +58,7 @@ DLLFUNC int MOD_INIT(m_netinfo)(ModuleInfo *modinfo) { - add_Command(MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA); + CommandAdd(modinfo->handle, MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -70,11 +70,6 @@ DLLFUNC int MOD_UNLOAD(m_netinfo)(int module_unload) { - if (del_Command(MSG_NETINFO, TOK_NETINFO, m_netinfo) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_netinfo).name); - } return MOD_SUCCESS; } --- src/modules/m_oper.c 2007-03-12 22:18:32.000000000 -0400 +++ src/modules/m_oper.c 2007-04-26 05:34:29.000000000 -0400 @@ -118,9 +118,9 @@ DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_OPER, TOK_OPER, m_oper, MAXPARA); + CommandAdd(modinfo->handle, MSG_OPER, TOK_OPER, m_oper, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -135,11 +135,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_oper)(int module_unload) { - if (del_Command(MSG_OPER, TOK_OPER, m_oper) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_oper).name); - } return MOD_SUCCESS; } --- src/modules/m_pass.c 2006-12-16 11:56:32.000000000 -0500 +++ src/modules/m_pass.c 2007-04-26 05:36:31.000000000 -0400 @@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_pass)(ModuleInfo *modinfo) { - add_CommandX(MSG_PASS, TOK_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER); + 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); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; @@ -81,11 +81,6 @@ DLLFUNC int MOD_UNLOAD(m_pass)(int module_unload) { - if (del_Command(MSG_PASS, TOK_PASS, m_pass) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_pass).name); - } return MOD_SUCCESS; } --- src/modules/m_pingpong.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_pingpong.c 2007-04-26 06:15:34.000000000 -0400 @@ -66,11 +66,11 @@ DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ Debug((DEBUG_NOTICE, "INIT")); - add_Command(MSG_PING, TOK_PING, m_ping, MAXPARA); - add_CommandX(MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS); + CommandAdd(modinfo->handle, MSG_PING, TOK_PING, m_ping, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -85,16 +85,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_pingpong)(int module_unload) { - if (del_Command(MSG_PING, TOK_PING, m_ping) < 0) - { - sendto_realops("Failed to delete command ping when unloading %s", - MOD_HEADER(m_pingpong).name); - } - if (del_Command(MSG_PONG, TOK_PONG, m_pong) < 0) - { - sendto_realops("Failed to delete command pong when unloading %s", - MOD_HEADER(m_pingpong).name); - } return MOD_SUCCESS; } --- src/modules/m_protoctl.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_protoctl.c 2007-04-26 06:16:41.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_protoctl)(ModuleInfo *modinfo) { - add_CommandX(MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER); + CommandAdd(modinfo->handle, MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_protoctl)(int module_unload) { - if (del_Command(MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_protoctl).name); - } return MOD_SUCCESS; } --- src/modules/m_quit.c 2006-12-03 15:49:56.000000000 -0500 +++ src/modules/m_quit.c 2007-04-26 05:30:49.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_CommandX(MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS); + CommandAdd(modinfo->handle, MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_quit)(int module_unload) { - if (del_Command(MSG_QUIT, TOK_QUIT, m_quit) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_quit).name); - } return MOD_SUCCESS; } --- src/modules/m_rakill.c 2003-11-11 15:20:22.000000000 -0500 +++ src/modules/m_rakill.c 2007-04-26 05:27:10.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_rakill)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA); + CommandAdd(modinfo->handle MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_rakill)(int module_unload) { - if (del_Command(MSG_RAKILL, TOK_RAKILL, m_rakill) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_rakill).name); - } return MOD_SUCCESS; } --- src/modules/m_rping.c 2003-11-11 15:20:22.000000000 -0500 +++ src/modules/m_rping.c 2007-04-26 06:16:29.000000000 -0400 @@ -67,10 +67,10 @@ DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_RPING, TOK_RPING, m_rping, MAXPARA); - add_Command(MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA); + CommandAdd(modinfo->handle, MSG_RPING, TOK_RPING, m_rping, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -85,16 +85,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_rping)(int module_unload) { - if (del_Command(MSG_RPING, TOK_RPING, m_rping) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_rping).name); - } - if (del_Command(MSG_RPONG, TOK_RPONG, m_rpong) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_rping).name); - } return MOD_SUCCESS; } --- src/modules/m_rules.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_rules.c 2007-04-26 06:12:43.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_rules)(ModuleInfo *modinfo) { - add_Command(MSG_RULES, TOK_RULES, m_rules, MAXPARA); + CommandAdd(modinfo->handle, MSG_RULES, TOK_RULES, m_rules, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_rules)(int module_unload) { - if (del_Command(MSG_RULES, TOK_RULES, m_rules) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_rules).name); - } return MOD_SUCCESS; } --- src/modules/m_sajoin.c 2007-04-25 13:37:05.000000000 -0400 +++ src/modules/m_sajoin.c 2007-04-26 06:12:29.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_sajoin)(ModuleInfo *modinfo) { - add_Command(MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA); + CommandAdd(modinfo->handle, MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_sajoin)(int module_unload) { - if (del_Command(MSG_SAJOIN, TOK_SAJOIN, m_sajoin) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sajoin).name); - } return MOD_SUCCESS; } --- src/modules/m_samode.c 2007-04-16 12:33:50.000000000 -0400 +++ src/modules/m_samode.c 2007-04-26 05:44:44.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_samode)(ModuleInfo *modinfo) { - add_Command(MSG_SAMODE, TOK_SAMODE, m_samode, MAXPARA); + CommandAdd(modinfo->handle, MSG_SAMODE, TOK_SAMODE, m_samode, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_samode)(int module_unload) { - if (del_Command(MSG_SAMODE, TOK_SAMODE, m_samode) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_samode).name); - } return MOD_SUCCESS; } --- src/modules/m_sapart.c 2007-04-16 02:36:26.000000000 -0400 +++ src/modules/m_sapart.c 2007-04-26 06:02:20.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_sapart)(ModuleInfo *modinfo) { - add_Command(MSG_SAPART, TOK_SAPART, m_sapart, 3); + CommandAdd(modinfo->handle, MSG_SAPART, TOK_SAPART, m_sapart, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_sapart)(int module_unload) { - if (del_Command(MSG_SAPART, TOK_SAPART, m_sapart) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sapart).name); - } return MOD_SUCCESS; } --- src/modules/m_sdesc.c 2007-01-22 07:51:44.000000000 -0500 +++ src/modules/m_sdesc.c 2007-04-26 06:15:05.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_sdesc)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SDESC, TOK_SDESC, m_sdesc, 1); + CommandAdd(modinfo->handle, MSG_SDESC, TOK_SDESC, m_sdesc, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -76,11 +76,6 @@ DLLFUNC int MOD_UNLOAD(m_sdesc)(int module_unload) { - if (del_Command(MSG_SDESC, TOK_SDESC, m_sdesc) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sdesc).name); - } return MOD_SUCCESS; } --- src/modules/m_sendsno.c 2006-08-16 02:59:30.000000000 -0400 +++ src/modules/m_sendsno.c 2007-04-26 06:01:41.000000000 -0400 @@ -61,7 +61,7 @@ /* This is called on module init, before Server Ready */ DLLFUNC int MOD_INIT(m_sendsno)(ModuleInfo *modinfo) { - add_CommandX(MSG_SENDSNO, TOK_SENDSNO, m_sendsno, MAXPARA, M_SERVER); + CommandAdd(modinfo->handle, MSG_SENDSNO, TOK_SENDSNO, m_sendsno, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -75,11 +75,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_sendsno)(int module_unload) { - if (del_Command(MSG_SENDSNO, TOK_SENDSNO, m_sendsno) < 0) - { - sendto_realops("Failed to delete command sendsno when unloading %s", - MOD_HEADER(m_sendsno).name); - } return MOD_SUCCESS; } --- src/modules/m_sendumode.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_sendumode.c 2007-04-26 05:20:47.000000000 -0400 @@ -64,10 +64,10 @@ DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA); - add_Command(MSG_SMO, TOK_SMO, m_sendumode, MAXPARA); + CommandAdd(modinfo->handle, MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SMO, TOK_SMO, m_sendumode, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -81,19 +81,7 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_sendumode)(int module_unload) { - if (del_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode) < 0) - { - sendto_realops("Failed to delete command sendumode when unloading %s", - MOD_HEADER(m_sendumode).name); - } - if (del_Command(MSG_SMO, TOK_SMO, m_sendumode) < 0) - { - sendto_realops("Failed to delete command smo when unloading %s", - MOD_HEADER(m_sendumode).name); - } return MOD_SUCCESS; - - } /* --- src/modules/m_server.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_server.c 2007-04-26 05:37:21.000000000 -0400 @@ -64,7 +64,7 @@ DLLFUNC int MOD_INIT(m_server)(ModuleInfo *modinfo) { - add_CommandX(MSG_SERVER, TOK_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER); + CommandAdd(modinfo->handle, MSG_SERVER, TOK_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -76,11 +76,6 @@ DLLFUNC int MOD_UNLOAD(m_server)(int module_unload) { - if (del_Command(MSG_SERVER, TOK_SERVER, m_server) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_server).name); - } return MOD_SUCCESS; } --- src/modules/m_sethost.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_sethost.c 2007-04-26 05:46:05.000000000 -0400 @@ -63,9 +63,9 @@ DLLFUNC int MOD_INIT(m_sethost)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA); + CommandAdd(modinfo->handle, MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -77,11 +77,6 @@ DLLFUNC int MOD_UNLOAD(m_sethost)(int module_unload) { - if (del_Command(MSG_SETHOST, TOK_SETHOST, m_sethost) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sethost).name); - } return MOD_SUCCESS; } --- src/modules/m_setident.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_setident.c 2007-04-26 05:21:36.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_setident)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA); + CommandAdd(modinfo->handle, MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -76,11 +76,6 @@ DLLFUNC int MOD_UNLOAD(m_setident)(int module_unload) { - if (del_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_setident).name); - } return MOD_SUCCESS; } --- src/modules/m_setname.c 2007-04-17 13:21:22.000000000 -0400 +++ src/modules/m_setname.c 2007-04-26 06:10:02.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_setname)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SETNAME, TOK_SETNAME, m_setname, 1); + CommandAdd(modinfo->handle, MSG_SETNAME, TOK_SETNAME, m_setname, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -76,11 +76,6 @@ DLLFUNC int MOD_UNLOAD(m_setname)(int module_unload) { - if (del_Command(MSG_SETNAME, TOK_SETNAME, m_setname) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_setname).name); - } return MOD_SUCCESS; } --- src/modules/m_silence.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_silence.c 2007-04-26 06:09:27.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_silence)(ModuleInfo *modinfo) { - add_Command(MSG_SILENCE, TOK_SILENCE, m_silence, MAXPARA); + CommandAdd(modinfo->handle, MSG_SILENCE, TOK_SILENCE, m_silence, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_silence)(int module_unload) { - if (del_Command(MSG_SILENCE, TOK_SILENCE, m_silence) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_silence).name); - } return MOD_SUCCESS; } --- src/modules/m_sjoin.c 2006-08-29 08:02:08.000000000 -0400 +++ src/modules/m_sjoin.c 2007-04-26 05:40:14.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_sjoin)(ModuleInfo *modinfo) { - add_Command(MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA); + CommandAdd(modinfo->handle, MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_sjoin)(int module_unload) { - if (del_Command(MSG_SJOIN, TOK_SJOIN, m_sjoin) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sjoin).name); - } return MOD_SUCCESS; } --- src/modules/m_sqline.c 2004-02-22 13:41:06.000000000 -0500 +++ src/modules/m_sqline.c 2007-04-26 06:20:29.000000000 -0400 @@ -64,9 +64,9 @@ DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA); + CommandAdd(modinfo->handle, MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -81,11 +81,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_sqline)(int module_unload) { - if (del_Command(MSG_SQLINE, TOK_SQLINE, m_sqline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_sqline).name); - } return MOD_SUCCESS; } --- src/modules/m_squit.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_squit.c 2007-04-26 06:00:52.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_squit)(ModuleInfo *modinfo) { - add_Command(MSG_SQUIT, TOK_SQUIT, m_squit, 2); + CommandAdd(modinfo->handle, MSG_SQUIT, TOK_SQUIT, m_squit, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_squit)(int module_unload) { - if (del_Command(MSG_SQUIT, TOK_SQUIT, m_squit) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_squit).name); - } return MOD_SUCCESS; } --- src/modules/m_stats.c 2006-12-16 11:56:32.000000000 -0500 +++ src/modules/m_stats.c 2007-04-26 06:11:05.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_stats)(ModuleInfo *modinfo) { - add_Command(MSG_STATS, TOK_STATS, m_stats, 3); + CommandAdd(modinfo->handle, MSG_STATS, TOK_STATS, m_stats, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_stats)(int module_unload) { - if (del_Command(MSG_STATS, TOK_STATS, m_stats) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_stats).name); - } return MOD_SUCCESS; } --- src/modules/m_svsfline.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svsfline.c 2007-04-26 06:14:36.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_svsfline)(ModuleInfo *modinfo) { - add_Command(MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_svsfline)(int module_unload) { - if (del_Command(MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsfline).name); - } return MOD_SUCCESS; } --- src/modules/m_svsjoin.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svsjoin.c 2007-04-26 05:45:24.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_svsjoin)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svsjoin)(int module_unload) { - if (del_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsjoin).name); - } return MOD_SUCCESS; } --- src/modules/m_svskill.c 2004-02-16 18:17:13.000000000 -0500 +++ src/modules/m_svskill.c 2007-04-26 05:36:02.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_svskill)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSKILL, TOK_SVSKILL, m_svskill, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSKILL, TOK_SVSKILL, m_svskill, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svskill)(int module_unload) { - if (del_Command(MSG_SVSKILL, TOK_SVSKILL, m_svskill) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svskill).name); - } return MOD_SUCCESS; } --- src/modules/m_svslusers.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svslusers.c 2007-04-26 05:48:06.000000000 -0400 @@ -61,7 +61,7 @@ DLLFUNC int MOD_INIT(m_svslusers)(ModuleInfo *modinfo) { - add_Command(MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -73,11 +73,6 @@ DLLFUNC int MOD_UNLOAD(m_svslusers)(int module_unload) { - if (del_Command(MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svslusers).name); - } return MOD_SUCCESS; } /* --- src/modules/m_svsmode.c 2006-11-03 18:32:39.000000000 -0500 +++ src/modules/m_svsmode.c 2007-04-26 05:31:52.000000000 -0400 @@ -66,8 +66,8 @@ DLLFUNC int MOD_INIT(m_svsmode)(ModuleInfo *modinfo) { - add_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA); - add_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ DLLFUNC int MOD_UNLOAD(m_svsmode)(int module_unload) { - if (del_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode) < 0 || del_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsmode).name); - } return MOD_SUCCESS; } --- src/modules/m_svsmotd.c 2006-11-12 13:59:43.000000000 -0500 +++ src/modules/m_svsmotd.c 2007-04-26 06:09:44.000000000 -0400 @@ -63,7 +63,7 @@ DLLFUNC int MOD_INIT(m_svsmotd)(ModuleInfo *modinfo) { - add_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -75,11 +75,6 @@ DLLFUNC int MOD_UNLOAD(m_svsmotd)(int module_unload) { - if (del_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsmotd).name); - } return MOD_SUCCESS; } --- src/modules/m_svsnick.c 2006-09-03 16:40:04.000000000 -0400 +++ src/modules/m_svsnick.c 2007-04-26 06:12:57.000000000 -0400 @@ -62,7 +62,7 @@ DLLFUNC int MOD_INIT(m_svsnick)(ModuleInfo *modinfo) { - add_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -74,11 +74,6 @@ DLLFUNC int MOD_UNLOAD(m_svsnick)(int module_unload) { - if (del_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsnick).name); - } return MOD_SUCCESS; } /* --- src/modules/m_svsnline.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svsnline.c 2007-04-26 06:20:50.000000000 -0400 @@ -65,9 +65,9 @@ DLLFUNC int MOD_INIT(m_svsnline)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -81,11 +81,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svsnline)(int module_unload) { - if (del_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsnline).name); - } return MOD_SUCCESS; } --- src/modules/m_svsnolag.c 2007-01-22 07:47:32.000000000 -0500 +++ src/modules/m_svsnolag.c 2007-04-26 06:10:27.000000000 -0400 @@ -62,8 +62,8 @@ DLLFUNC int MOD_INIT(m_svsnolag)(ModuleInfo *modinfo) { - add_Command(MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag, MAXPARA); - add_Command(MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -75,11 +75,6 @@ DLLFUNC int MOD_UNLOAD(m_svsnolag)(int module_unload) { - if (del_Command(MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag) < 0 || del_Command(MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsnolag).name); - } return MOD_SUCCESS; } --- src/modules/m_svsnoop.c 2006-08-16 02:59:30.000000000 -0400 +++ src/modules/m_svsnoop.c 2007-04-26 06:02:01.000000000 -0400 @@ -63,7 +63,7 @@ DLLFUNC int MOD_INIT(m_svsnoop)(ModuleInfo *modinfo) { - add_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -75,11 +75,6 @@ DLLFUNC int MOD_UNLOAD(m_svsnoop)(int module_unload) { - if (del_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svsnoop).name); - } return MOD_SUCCESS; } int m_svsnoop(aClient *cptr, aClient *sptr, int parc, char *parv[]) --- src/modules/m_svso.c 2007-04-16 13:05:48.000000000 -0400 +++ src/modules/m_svso.c 2007-04-26 06:10:41.000000000 -0400 @@ -98,7 +98,7 @@ DLLFUNC int MOD_INIT(m_svso)(ModuleInfo *modinfo) { - add_Command(MSG_SVSO, TOK_SVSO, m_svso, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSO, TOK_SVSO, m_svso, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -110,11 +110,6 @@ DLLFUNC int MOD_UNLOAD(m_svso)(int module_unload) { - if (del_Command(MSG_SVSO, TOK_SVSO, m_svso) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svso).name); - } return MOD_SUCCESS; } /* --- src/modules/m_svspart.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svspart.c 2007-04-26 05:33:57.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_svspart)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSPART, TOK_SVSPART, m_svspart, 3); + CommandAdd(modinfo->handle, MSG_SVSPART, TOK_SVSPART, m_svspart, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svspart)(int module_unload) { - if (del_Command(MSG_SVSPART, TOK_SVSPART, m_svspart) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svspart).name); - } return MOD_SUCCESS; } --- src/modules/m_svssilence.c 2003-11-11 15:20:22.000000000 -0500 +++ src/modules/m_svssilence.c 2007-04-26 05:22:30.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_svssilence)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svssilence)(int module_unload) { - if (del_Command(MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svssilence).name); - } return MOD_SUCCESS; } --- src/modules/m_svssno.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svssno.c 2007-04-26 05:26:37.000000000 -0400 @@ -63,8 +63,8 @@ DLLFUNC int MOD_INIT(m_svssno)(ModuleInfo *modinfo) { - add_Command(MSG_SVSSNO, TOK_SVSSNO, m_svssno, MAXPARA); - add_Command(MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSSNO, TOK_SVSSNO, m_svssno, MAXPARA, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -76,11 +76,6 @@ DLLFUNC int MOD_UNLOAD(m_svssno)(int module_unload) { - if (del_Command(MSG_SVSSNO, TOK_SVSSNO, m_svssno) < 0 || del_Command(MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svssno).name); - } return MOD_SUCCESS; } --- src/modules/m_svswatch.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_svswatch.c 2007-04-26 06:16:59.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_svswatch)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA); + CommandAdd(modinfo->handle, MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_svswatch)(int module_unload) { - if (del_Command(MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_svswatch).name); - } return MOD_SUCCESS; } --- src/modules/m_swhois.c 2003-11-11 15:20:23.000000000 -0500 +++ src/modules/m_swhois.c 2007-04-26 05:49:20.000000000 -0400 @@ -62,7 +62,7 @@ DLLFUNC int MOD_INIT(m_swhois)(ModuleInfo *modinfo) { - add_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA); + CommandAdd(modinfo->handle, MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -74,11 +74,6 @@ DLLFUNC int MOD_UNLOAD(m_swhois)(int module_unload) { - if (del_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_swhois).name); - } return MOD_SUCCESS; } /* --- src/modules/m_time.c 2004-02-16 18:17:13.000000000 -0500 +++ src/modules/m_time.c 2007-04-26 06:13:15.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_time)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_TIME, TOK_TIME, m_time, MAXPARA); + CommandAdd(modinfo->handle, MSG_TIME, TOK_TIME, m_time, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -79,11 +79,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_time)(int module_unload) { - if (del_Command(MSG_TIME, TOK_TIME, m_time) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_time).name); - } return MOD_SUCCESS; } --- src/modules/m_tkl.c 2007-04-24 07:51:55.000000000 -0400 +++ src/modules/m_tkl.c 2007-04-26 05:57:18.000000000 -0400 @@ -141,16 +141,16 @@ { MARK_AS_OFFICIAL_MODULE(modinfo); /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_GLINE, TOK_GLINE, m_gline, 3); - add_Command(MSG_SHUN, TOK_SHUN, m_shun, 3); - add_Command(MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun, 2); - add_Command(MSG_ZLINE, TOK_NONE, m_tzline, 3); - add_Command(MSG_KLINE, TOK_NONE, m_tkline, 3); - add_Command(MSG_GZLINE, TOK_NONE, m_gzline, 3); - add_Command(MSG_SPAMFILTER, TOK_NONE, m_spamfilter, 6); - add_Command(MSG_TKL, TOK_TKL, _m_tkl, MAXPARA); + CommandAdd(modinfo->handle, MSG_GLINE, TOK_GLINE, m_gline, 3, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SHUN, TOK_SHUN, m_shun, 3, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun, 2, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_ZLINE, TOK_NONE, m_tzline, 3, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_KLINE, TOK_NONE, m_tkline, 3, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_GZLINE, TOK_NONE, m_gzline, 3, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_SPAMFILTER, TOK_NONE, m_spamfilter, 6, M_USER|M_SERVER); + CommandAdd(modinfo->handle, MSG_TKL, TOK_TKL, _m_tkl, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -165,19 +165,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_tkl)(int module_unload) { - if ((del_Command(MSG_GLINE, TOK_GLINE, m_gline) < 0) || - (del_Command(MSG_SHUN, TOK_SHUN, m_shun) < 0 ) || - (del_Command(MSG_ZLINE, TOK_NONE, m_tzline) < 0) || - (del_Command(MSG_GZLINE, TOK_NONE, m_gzline) < 0) || - (del_Command(MSG_KLINE, TOK_NONE, m_tkline) < 0) || - (del_Command(MSG_SPAMFILTER, TOK_NONE, m_spamfilter) < 0) || - (del_Command(MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun) < 0) || - (del_Command(MSG_TKL, TOK_TKL, _m_tkl) < 0)) - - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_tkl).name); - } return MOD_SUCCESS; } --- src/modules/m_topic.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_topic.c 2007-04-26 06:01:07.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_topic)(ModuleInfo *modinfo) { - add_Command(MSG_TOPIC, TOK_TOPIC, m_topic, 4); + CommandAdd(modinfo->handle, MSG_TOPIC, TOK_TOPIC, m_topic, 4, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_topic)(int module_unload) { - if (del_Command(MSG_TOPIC, TOK_TOPIC, m_topic) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_topic).name); - } return MOD_SUCCESS; } --- src/modules/m_trace.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_trace.c 2007-04-26 06:17:58.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_trace)(ModuleInfo *modinfo) { - add_Command(MSG_TRACE, TOK_TRACE, m_trace, MAXPARA); + CommandAdd(modinfo->handle, MSG_TRACE, TOK_TRACE, m_trace, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_trace)(int module_unload) { - if (del_Command(MSG_TRACE, TOK_TRACE, m_trace) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_trace).name); - } return MOD_SUCCESS; } --- src/modules/m_tsctl.c 2006-09-29 15:45:59.000000000 -0400 +++ src/modules/m_tsctl.c 2007-04-26 05:42:25.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_tsctl)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA); + CommandAdd(modinfo->handle, MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_tsctl)(int module_unload) { - if (del_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_tsctl).name); - } return MOD_SUCCESS; } --- src/modules/m_umode2.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_umode2.c 2007-04-26 05:40:33.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_umode2)(ModuleInfo *modinfo) { - add_Command(MSG_UMODE2, TOK_UMODE2, m_umode2, MAXPARA); + CommandAdd(modinfo->handle, MSG_UMODE2, TOK_UMODE2, m_umode2, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_umode2)(int module_unload) { - if (del_Command(MSG_UMODE2, TOK_UMODE2, m_umode2) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_umode2).name); - } return MOD_SUCCESS; } --- src/modules/m_undccdeny.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_undccdeny.c 2007-04-26 05:42:57.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_undccdeny)(ModuleInfo *modinfo) { - add_Command(MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny, MAXPARA); + CommandAdd(modinfo->handle, MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_undccdeny)(int module_unload) { - if (del_Command(MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_undccdeny).name); - } return MOD_SUCCESS; } --- src/modules/m_unkline.c 2003-11-11 15:20:23.000000000 -0500 +++ src/modules/m_unkline.c 2007-04-26 06:18:58.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_unkline)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA); + CommandAdd(modinfo->handle, MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_unkline)(int module_unload) { - if (del_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_unkline).name); - } return MOD_SUCCESS; } --- src/modules/m_unsqline.c 2004-02-22 13:41:06.000000000 -0500 +++ src/modules/m_unsqline.c 2007-04-26 06:19:32.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_unsqline)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA); + CommandAdd(modinfo->handle, MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_unsqline)(int module_unload) { - if (del_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_unsqline).name); - } return MOD_SUCCESS; } --- src/modules/m_unzline.c 2003-11-11 15:20:23.000000000 -0500 +++ src/modules/m_unzline.c 2007-04-26 06:18:43.000000000 -0400 @@ -62,9 +62,9 @@ DLLFUNC int MOD_INIT(m_unzline)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA); + CommandAdd(modinfo->handle, MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -78,11 +78,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_unzline)(int module_unload) { - if (del_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_unzline).name); - } return MOD_SUCCESS; } --- src/modules/m_userhost.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_userhost.c 2007-04-26 06:18:13.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_userhost)(ModuleInfo *modinfo) { - add_Command(MSG_USERHOST, TOK_USERHOST, m_userhost, 1); + CommandAdd(modinfo->handle, MSG_USERHOST, TOK_USERHOST, m_userhost, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_userhost)(int module_unload) { - if (del_Command(MSG_USERHOST, TOK_USERHOST, m_userhost) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_userhost).name); - } return MOD_SUCCESS; } --- src/modules/m_vhost.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_vhost.c 2007-04-26 05:39:57.000000000 -0400 @@ -63,9 +63,9 @@ DLLFUNC int MOD_INIT(m_vhost)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA); + CommandAdd(modinfo->handle, MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -80,11 +80,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_vhost)(int module_unload) { - if (del_Command(MSG_VHOST, TOK_VHOST, m_vhost) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_vhost).name); - } return MOD_SUCCESS; } --- src/modules/m_wallops.c 2004-02-23 18:14:05.000000000 -0500 +++ src/modules/m_wallops.c 2007-04-26 05:27:57.000000000 -0400 @@ -60,7 +60,7 @@ DLLFUNC int MOD_INIT(m_wallops)(ModuleInfo *modinfo) { - add_Command(MSG_WALLOPS, TOK_WALLOPS, m_wallops, 1); + CommandAdd(modinfo->handle, MSG_WALLOPS, TOK_WALLOPS, m_wallops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -72,11 +72,6 @@ DLLFUNC int MOD_UNLOAD(m_wallops)(int module_unload) { - if (del_Command(MSG_WALLOPS, TOK_WALLOPS, m_wallops) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_wallops).name); - } return MOD_SUCCESS; } --- src/modules/m_who.c 2006-09-22 15:57:29.000000000 -0400 +++ src/modules/m_who.c 2007-04-26 05:24:04.000000000 -0400 @@ -69,9 +69,9 @@ DLLFUNC int MOD_INIT(m_who)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_WHO, TOK_WHO, m_who, MAXPARA); + CommandAdd(modinfo->handle, MSG_WHO, TOK_WHO, m_who, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -86,11 +86,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_who)(int module_unload) { - if (del_Command(MSG_WHO, TOK_WHO, m_who) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_who).name); - } return MOD_SUCCESS; } --- src/modules/m_whois.c 2007-04-24 07:29:08.000000000 -0400 +++ src/modules/m_whois.c 2007-04-26 05:43:39.000000000 -0400 @@ -64,9 +64,9 @@ DLLFUNC int MOD_INIT(m_whois)(ModuleInfo *modinfo) { /* - * We call our add_Command crap here + * We call our CommandAdd crap here */ - add_Command(MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA); + CommandAdd(modinfo->handle, MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -80,11 +80,6 @@ /* Called when module is unloaded */ DLLFUNC int MOD_UNLOAD(m_whois)(int module_unload) { - if (del_Command(MSG_WHOIS, TOK_WHOIS, m_whois) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_whois).name); - } return MOD_SUCCESS; } --- src/modules/m_whowas.c 2006-08-05 09:23:30.000000000 -0400 +++ src/modules/m_whowas.c 2007-04-26 06:19:11.000000000 -0400 @@ -61,7 +61,7 @@ DLLFUNC int MOD_INIT(m_whowas)(ModuleInfo *modinfo) { - add_Command(MSG_WHOWAS, TOK_WHOWAS, m_whowas, MAXPARA); + CommandAdd(modinfo->handle, MSG_WHOWAS, TOK_WHOWAS, m_whowas, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } @@ -73,11 +73,6 @@ DLLFUNC int MOD_UNLOAD(m_whowas)(int module_unload) { - if (del_Command(MSG_WHOWAS, TOK_WHOWAS, m_whowas) < 0) - { - sendto_realops("Failed to delete commands when unloading %s", - MOD_HEADER(m_whowas).name); - } return MOD_SUCCESS; }