From bb1bb35f50a631f7891d290c7e4f65d1c716b33e Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 13 Sep 2019 15:15:47 +0200 Subject: [PATCH] MOD_LOAD(xyz) is now just MOD_LOAD(), same for MOD_TEST, MOD_INIT, MOD_UNLOAD. And MOD_HEADER(xyz) is now MOD_HEADER even without () since this isn't a function, really. To make things understandable I added the following to the developer section of the release notes: * The module header is now as follows: ModuleHeader MOD_HEADER = { "nameofmodule", "5.0", "Some description", "Name of Author", "unrealircd-5", }; There's a new author field, the version must start with a digit, and also the name of the module must match the loadmodule name. So for example third/funmod must also be named third/funmod. * The MOD_TEST, MOD_INIT, MOD_LOAD and MOD_UNLOAD functions no longer take a name argument. So: MOD_INIT(mymod) is now MOD_INIT() --- doc/RELEASE-NOTES | 20 ++++++++++++++------ include/modules.h | 10 +++++----- src/modules.c | 2 +- src/modules/account-tag.c | 8 ++++---- src/modules/addmotd.c | 8 ++++---- src/modules/addomotd.c | 8 ++++---- src/modules/admin.c | 8 ++++---- src/modules/antimixedutf8.c | 10 +++++----- src/modules/antirandom.c | 10 +++++----- src/modules/authprompt.c | 10 +++++----- src/modules/away.c | 8 ++++---- src/modules/batch.c | 8 ++++---- src/modules/blacklist.c | 10 +++++----- src/modules/botmotd.c | 8 ++++---- src/modules/cap.c | 8 ++++---- src/modules/certfp.c | 8 ++++---- src/modules/chanmodes/censor.c | 10 +++++----- src/modules/chanmodes/delayjoin.c | 8 ++++---- src/modules/chanmodes/floodprot.c | 10 +++++----- src/modules/chanmodes/history.c | 10 +++++----- src/modules/chanmodes/issecure.c | 10 +++++----- src/modules/chanmodes/link.c | 8 ++++---- src/modules/chanmodes/nocolor.c | 10 +++++----- src/modules/chanmodes/noctcp.c | 10 +++++----- src/modules/chanmodes/noinvite.c | 10 +++++----- src/modules/chanmodes/nokick.c | 10 +++++----- src/modules/chanmodes/noknock.c | 10 +++++----- src/modules/chanmodes/nonickchange.c | 10 +++++----- src/modules/chanmodes/nonotice.c | 10 +++++----- src/modules/chanmodes/operonly.c | 10 +++++----- src/modules/chanmodes/permanent.c | 8 ++++---- src/modules/chanmodes/regonly.c | 10 +++++----- src/modules/chanmodes/regonlyspeak.c | 10 +++++----- src/modules/chanmodes/secureonly.c | 10 +++++----- src/modules/chanmodes/stripcolor.c | 10 +++++----- src/modules/channeldb.c | 14 +++++++------- src/modules/charsys.c | 10 +++++----- src/modules/chghost.c | 8 ++++---- src/modules/chgident.c | 8 ++++---- src/modules/chgname.c | 8 ++++---- src/modules/cloak.c | 10 +++++----- src/modules/close.c | 8 ++++---- src/modules/connect.c | 8 ++++---- src/modules/connthrottle.c | 10 +++++----- src/modules/cycle.c | 8 ++++---- src/modules/dccallow.c | 8 ++++---- src/modules/dccdeny.c | 8 ++++---- src/modules/echo-message.c | 8 ++++---- src/modules/eos.c | 8 ++++---- src/modules/extbans/account.c | 8 ++++---- src/modules/extbans/certfp.c | 8 ++++---- src/modules/extbans/inchannel.c | 8 ++++---- src/modules/extbans/join.c | 8 ++++---- src/modules/extbans/msgbypass.c | 8 ++++---- src/modules/extbans/nickchange.c | 8 ++++---- src/modules/extbans/operclass.c | 8 ++++---- src/modules/extbans/partmsg.c | 8 ++++---- src/modules/extbans/quiet.c | 8 ++++---- src/modules/extbans/realname.c | 8 ++++---- src/modules/extbans/textban.c | 8 ++++---- src/modules/extbans/timedban.c | 10 +++++----- src/modules/globops.c | 8 ++++---- src/modules/help.c | 8 ++++---- src/modules/hideserver.c | 10 +++++----- src/modules/history_backend_mem.c | 8 ++++---- src/modules/history_backend_null.c | 8 ++++---- src/modules/invite.c | 8 ++++---- src/modules/ircops.c | 8 ++++---- src/modules/ison.c | 8 ++++---- src/modules/join.c | 10 +++++----- src/modules/jointhrottle.c | 10 +++++----- src/modules/jumpserver.c | 8 ++++---- src/modules/kick.c | 8 ++++---- src/modules/kill.c | 8 ++++---- src/modules/knock.c | 8 ++++---- src/modules/labeled-response.c | 8 ++++---- src/modules/lag.c | 8 ++++---- src/modules/link-security.c | 8 ++++---- src/modules/links.c | 8 ++++---- src/modules/list.c | 10 +++++----- src/modules/locops.c | 8 ++++---- src/modules/lusers.c | 8 ++++---- src/modules/map.c | 8 ++++---- src/modules/md.c | 10 +++++----- src/modules/mdex.c | 8 ++++---- src/modules/message-ids.c | 8 ++++---- src/modules/message-tags.c | 10 +++++----- src/modules/message.c | 10 +++++----- src/modules/mkpasswd.c | 8 ++++---- src/modules/mode.c | 10 +++++----- src/modules/motd.c | 8 ++++---- src/modules/names.c | 8 ++++---- src/modules/netinfo.c | 8 ++++---- src/modules/nick.c | 10 +++++----- src/modules/nocodes.c | 8 ++++---- src/modules/oper.c | 8 ++++---- src/modules/opermotd.c | 8 ++++---- src/modules/part.c | 8 ++++---- src/modules/pass.c | 10 +++++----- src/modules/pingpong.c | 8 ++++---- src/modules/plaintext-policy.c | 8 ++++---- src/modules/protoctl.c | 8 ++++---- src/modules/quit.c | 8 ++++---- src/modules/reputation.c | 10 +++++----- src/modules/require-module.c | 12 ++++++------ src/modules/restrict-commands.c | 12 ++++++------ src/modules/rmtkl.c | 10 +++++----- src/modules/rules.c | 8 ++++---- src/modules/sajoin.c | 8 ++++---- src/modules/samode.c | 8 ++++---- src/modules/sapart.c | 8 ++++---- src/modules/sasl.c | 8 ++++---- src/modules/sdesc.c | 8 ++++---- src/modules/sendsno.c | 8 ++++---- src/modules/sendumode.c | 8 ++++---- src/modules/server-time.c | 8 ++++---- src/modules/server.c | 10 +++++----- src/modules/sethost.c | 8 ++++---- src/modules/setident.c | 8 ++++---- src/modules/setname.c | 8 ++++---- src/modules/silence.c | 8 ++++---- src/modules/sinfo.c | 8 ++++---- src/modules/sjoin.c | 8 ++++---- src/modules/snomasks/dccreject.c | 10 +++++----- src/modules/sqline.c | 8 ++++---- src/modules/squit.c | 8 ++++---- src/modules/staff.c | 10 +++++----- src/modules/starttls.c | 8 ++++---- src/modules/stats.c | 8 ++++---- src/modules/sts.c | 8 ++++---- src/modules/svsfline.c | 8 ++++---- src/modules/svsjoin.c | 8 ++++---- src/modules/svskill.c | 8 ++++---- src/modules/svslusers.c | 8 ++++---- src/modules/svsmode.c | 8 ++++---- src/modules/svsmotd.c | 8 ++++---- src/modules/svsnick.c | 8 ++++---- src/modules/svsnline.c | 8 ++++---- src/modules/svsnolag.c | 8 ++++---- src/modules/svsnoop.c | 8 ++++---- src/modules/svspart.c | 8 ++++---- src/modules/svssilence.c | 8 ++++---- src/modules/svssno.c | 8 ++++---- src/modules/svswatch.c | 8 ++++---- src/modules/swhois.c | 8 ++++---- src/modules/time.c | 8 ++++---- src/modules/tkl.c | 10 +++++----- src/modules/tkldb.c | 14 +++++++------- src/modules/tls_antidos.c | 8 ++++---- src/modules/topic.c | 8 ++++---- src/modules/trace.c | 8 ++++---- src/modules/tsctl.c | 8 ++++---- src/modules/umode2.c | 8 ++++---- src/modules/undccdeny.c | 8 ++++---- src/modules/unsqline.c | 8 ++++---- src/modules/user.c | 8 ++++---- src/modules/userhost.c | 8 ++++---- src/modules/userip.c | 8 ++++---- src/modules/usermodes/bot.c | 10 +++++----- src/modules/usermodes/censor.c | 10 +++++----- src/modules/usermodes/noctcp.c | 10 +++++----- src/modules/usermodes/nokick.c | 10 +++++----- src/modules/usermodes/privacy.c | 8 ++++---- src/modules/usermodes/privdeaf.c | 8 ++++---- src/modules/usermodes/regonlymsg.c | 8 ++++---- src/modules/usermodes/secureonlymsg.c | 8 ++++---- src/modules/usermodes/servicebot.c | 10 +++++----- src/modules/usermodes/showwhois.c | 10 +++++----- src/modules/vhost.c | 8 ++++---- src/modules/wallops.c | 8 ++++---- src/modules/watch.c | 8 ++++---- src/modules/webirc.c | 10 +++++----- src/modules/webredir.c | 10 +++++----- src/modules/websocket.c | 8 ++++---- src/modules/who_old.c | 8 ++++---- src/modules/whois.c | 8 ++++---- src/modules/whowas.c | 8 ++++---- src/modules/whox.c | 8 ++++---- 178 files changed, 778 insertions(+), 770 deletions(-) diff --git a/doc/RELEASE-NOTES b/doc/RELEASE-NOTES index c8e269a9c..5ee391662 100644 --- a/doc/RELEASE-NOTES +++ b/doc/RELEASE-NOTES @@ -241,12 +241,20 @@ IMPORTANT: As long as UnrealIRCd 5 is in alpha stage, we do not suggest Of course you may, but the module API is still very likely to change so you may have to do certain (other) changes again next alpha release. It is therefore best to wait until beta1. You have been warned ;). -* The ModuleHeader struct has been changed. An author field has been - added, the last field (which was always NULL) has been removed, - and there are now restrictions on the name and version fields to - ensure the version starts with a digit etc. - Have a look at one of the many src/modules/*.c for inspiration. - Also, be sure to use "unrealircd-5" for the last field. +* The module header is now as follows: + ModuleHeader MOD_HEADER + = { + "nameofmodule", + "5.0", + "Some description", + "Name of Author", + "unrealircd-5", + }; + There's a new author field, the version must start with a digit, + and also the name of the module must match the loadmodule name. + So for example third/funmod must also be named third/funmod. +* The MOD_TEST, MOD_INIT, MOD_LOAD and MOD_UNLOAD functions no longer + take a name argument. So: MOD_INIT(mymod) is now MOD_INIT() * In UnrealIRCd 5, during development, --enable-asan is ON by default to catch more bugs. This also means an up to 10x slowdown and more memory usage. When we reach 5.0.0 stable this will be turned off. diff --git a/include/modules.h b/include/modules.h index d65347c40..56a8072a0 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1257,11 +1257,11 @@ enum EfunctionType { #define CONFIG_REQUIRE 9 #define CONFIG_LISTEN 10 -#define MOD_HEADER(name) Mod_Header -#define MOD_TEST(name) DLLFUNC int Mod_Test(ModuleInfo *modinfo) -#define MOD_INIT(name) DLLFUNC int Mod_Init(ModuleInfo *modinfo) -#define MOD_LOAD(name) DLLFUNC int Mod_Load(ModuleInfo *modinfo) -#define MOD_UNLOAD(name) DLLFUNC int Mod_Unload(ModuleInfo *modinfo) +#define MOD_HEADER Mod_Header +#define MOD_TEST() DLLFUNC int Mod_Test(ModuleInfo *modinfo) +#define MOD_INIT() DLLFUNC int Mod_Init(ModuleInfo *modinfo) +#define MOD_LOAD() DLLFUNC int Mod_Load(ModuleInfo *modinfo) +#define MOD_UNLOAD() DLLFUNC int Mod_Unload(ModuleInfo *modinfo) #define CLOAK_KEYCRC RCallbacks[CALLBACKTYPE_CLOAKKEYCSUM] != NULL ? RCallbacks[CALLBACKTYPE_CLOAKKEYCSUM]->func.pcharfunc() : "nil" diff --git a/src/modules.c b/src/modules.c index 40256f3e2..9f2cb9dd6 100644 --- a/src/modules.c +++ b/src/modules.c @@ -234,7 +234,7 @@ static char *validate_mod_header(char *relpath, ModuleHeader *mod_header) /* Validate module name */ if (strcmp(mod_header->name, relpath)) { - snprintf(buf, sizeof(buf), "Module has path '%s' but uses name '%s' in MOD_HEADER(). These should be the same!", + snprintf(buf, sizeof(buf), "Module has path '%s' but uses name '%s' in MOD_HEADER. These should be the same!", relpath, mod_header->name); return buf; } diff --git a/src/modules/account-tag.c b/src/modules/account-tag.c index 931640dcb..a30cace04 100644 --- a/src/modules/account-tag.c +++ b/src/modules/account-tag.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(account-tag) +ModuleHeader MOD_HEADER = { "account-tag", "5.0", @@ -37,7 +37,7 @@ long CAP_ACCOUNT_TAG = 0L; int account_tag_mtag_is_ok(Client *acptr, char *name, char *value); void mtag_add_account(Client *acptr, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature); -MOD_INIT(account-tag) +MOD_INIT() { ClientCapabilityInfo cap; ClientCapability *c; @@ -60,12 +60,12 @@ MOD_INIT(account-tag) return MOD_SUCCESS; } -MOD_LOAD(account-tag) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(account-tag) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/addmotd.c b/src/modules/addmotd.c index 8d2b8dd49..e7c2561e6 100644 --- a/src/modules/addmotd.c +++ b/src/modules/addmotd.c @@ -26,7 +26,7 @@ CMD_FUNC(m_addmotd); #define MSG_ADDMOTD "ADDMOTD" -ModuleHeader MOD_HEADER(addmotd) +ModuleHeader MOD_HEADER = { "addmotd", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(addmotd) "unrealircd-5", }; -MOD_INIT(addmotd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_ADDMOTD, m_addmotd, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(addmotd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(addmotd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/addomotd.c b/src/modules/addomotd.c index 62cfa0e70..26172b78f 100644 --- a/src/modules/addomotd.c +++ b/src/modules/addomotd.c @@ -26,7 +26,7 @@ CMD_FUNC(m_addomotd); #define MSG_ADDOMOTD "ADDOMOTD" -ModuleHeader MOD_HEADER(addomotd) +ModuleHeader MOD_HEADER = { "addomotd", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(addomotd) "unrealircd-5", }; -MOD_INIT(addomotd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_ADDOMOTD, m_addomotd, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(addomotd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(addomotd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/admin.c b/src/modules/admin.c index 8f0952e33..36c4aa154 100644 --- a/src/modules/admin.c +++ b/src/modules/admin.c @@ -26,7 +26,7 @@ CMD_FUNC(m_admin); #define MSG_ADMIN "ADMIN" -ModuleHeader MOD_HEADER(admin) +ModuleHeader MOD_HEADER = { "admin", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(admin) "unrealircd-5", }; -MOD_INIT(admin) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(admin) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(admin) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/antimixedutf8.c b/src/modules/antimixedutf8.c index 2da4cbae8..6b6f89716 100644 --- a/src/modules/antimixedutf8.c +++ b/src/modules/antimixedutf8.c @@ -42,7 +42,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(antimixedutf8) +ModuleHeader MOD_HEADER = { "antimixedutf8", "1.0", @@ -207,13 +207,13 @@ CMD_OVERRIDE_FUNC(override_msg) /*** rest is module and config stuff ****/ -MOD_TEST(antimixedutf8) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, antimixedutf8_config_test); return MOD_SUCCESS; } -MOD_INIT(antimixedutf8) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -222,7 +222,7 @@ MOD_INIT(antimixedutf8) return MOD_SUCCESS; } -MOD_LOAD(antimixedutf8) +MOD_LOAD() { if (!CommandOverrideAdd(modinfo->handle, "PRIVMSG", override_msg)) return MOD_FAILED; @@ -233,7 +233,7 @@ MOD_LOAD(antimixedutf8) return MOD_SUCCESS; } -MOD_UNLOAD(antimixedutf8) +MOD_UNLOAD() { free_config(); return MOD_SUCCESS; diff --git a/src/modules/antirandom.c b/src/modules/antirandom.c index e7eff93f3..efacd6c1c 100644 --- a/src/modules/antirandom.c +++ b/src/modules/antirandom.c @@ -33,7 +33,7 @@ */ #undef TIMING -ModuleHeader MOD_HEADER(antirandom) +ModuleHeader MOD_HEADER = { "antirandom", "1.4", @@ -535,7 +535,7 @@ int antirandom_config_posttest(int *); int antirandom_preconnect(Client *sptr); static int is_exempt(Client *sptr); -MOD_TEST(antirandom) +MOD_TEST() { memset(&req, 0, sizeof(req)); memset(&cfg, 0, sizeof(cfg)); @@ -544,7 +544,7 @@ MOD_TEST(antirandom) return MOD_SUCCESS; } -MOD_INIT(antirandom) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); if (!init_stuff()) @@ -566,14 +566,14 @@ MOD_INIT(antirandom) void check_all_users(void); -MOD_LOAD(antirandom) +MOD_LOAD() { if (cfg.fullstatus_on_load) check_all_users(); return MOD_SUCCESS; } -MOD_UNLOAD(antirandom) +MOD_UNLOAD() { free_stuff(); free_config(); diff --git a/src/modules/authprompt.c b/src/modules/authprompt.c index ef1898810..7cb8c2ccc 100644 --- a/src/modules/authprompt.c +++ b/src/modules/authprompt.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(authprompt) +ModuleHeader MOD_HEADER = { "authprompt", "1.0", @@ -70,13 +70,13 @@ void authprompt_md_free(ModData *md); #define SEUSER(x) ((APUser *)moddata_client(x, authprompt_md).ptr) #define AGENT_SID(agent_p) (agent_p->user != NULL ? agent_p->user->server : agent_p->name) -MOD_TEST(authprompt) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, authprompt_config_test); return MOD_SUCCESS; } -MOD_INIT(authprompt) +MOD_INIT() { ModDataInfo mreq; @@ -109,13 +109,13 @@ MOD_INIT(authprompt) return MOD_SUCCESS; } -MOD_LOAD(authprompt) +MOD_LOAD() { config_postdefaults(); return MOD_SUCCESS; } -MOD_UNLOAD(authprompt) +MOD_UNLOAD() { free_config(); return MOD_SUCCESS; diff --git a/src/modules/away.c b/src/modules/away.c index 8bd5cd3ed..bf540cf62 100644 --- a/src/modules/away.c +++ b/src/modules/away.c @@ -28,7 +28,7 @@ CMD_FUNC(m_away); #define MSG_AWAY "AWAY" -ModuleHeader MOD_HEADER(away) +ModuleHeader MOD_HEADER = { "away", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(away) "unrealircd-5", }; -MOD_INIT(away) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_AWAY, m_away, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(away) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(away) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/batch.c b/src/modules/batch.c index 67f9aaccc..f155f5aac 100644 --- a/src/modules/batch.c +++ b/src/modules/batch.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(batch) +ModuleHeader MOD_HEADER = { "batch", "5.0", @@ -39,7 +39,7 @@ long CAP_BATCH = 0L; int batch_mtag_is_ok(Client *acptr, char *name, char *value); -MOD_INIT(batch) +MOD_INIT() { ClientCapabilityInfo cap; ClientCapability *c; @@ -61,12 +61,12 @@ MOD_INIT(batch) return MOD_SUCCESS; } -MOD_LOAD(batch) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(batch) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/blacklist.c b/src/modules/blacklist.c index 0fa5e3ea4..772f13d54 100644 --- a/src/modules/blacklist.c +++ b/src/modules/blacklist.c @@ -20,7 +20,7 @@ #include "unrealircd.h" #include "dns.h" -ModuleHeader MOD_HEADER(blacklist) +ModuleHeader MOD_HEADER = { "blacklist", "5.0", @@ -111,7 +111,7 @@ void blacklist_free_bluser_if_able(BLUser *bl); long SNO_BLACKLIST = 0L; -MOD_TEST(blacklist) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, blacklist_config_test); @@ -120,7 +120,7 @@ MOD_TEST(blacklist) } /** Called upon module init */ -MOD_INIT(blacklist) +MOD_INIT() { ModDataInfo mreq; @@ -156,14 +156,14 @@ MOD_INIT(blacklist) } /** Called upon module load */ -MOD_LOAD(blacklist) +MOD_LOAD() { blacklist_set_handshake_delay(); return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(blacklist) +MOD_UNLOAD() { blacklist_free_conf(); return MOD_SUCCESS; diff --git a/src/modules/botmotd.c b/src/modules/botmotd.c index 5db00042e..34c4b6b9d 100644 --- a/src/modules/botmotd.c +++ b/src/modules/botmotd.c @@ -26,7 +26,7 @@ CMD_FUNC(m_botmotd); #define MSG_BOTMOTD "BOTMOTD" -ModuleHeader MOD_HEADER(botmotd) +ModuleHeader MOD_HEADER = { "botmotd", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(botmotd) "unrealircd-5", }; -MOD_INIT(botmotd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_BOTMOTD, m_botmotd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(botmotd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(botmotd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/cap.c b/src/modules/cap.c index 3fb9870de..2fc0d35d7 100644 --- a/src/modules/cap.c +++ b/src/modules/cap.c @@ -28,7 +28,7 @@ CMD_FUNC(m_cap); #define MSG_CAP "CAP" -ModuleHeader MOD_HEADER(cap) +ModuleHeader MOD_HEADER = { "cap", /* Name of module */ "5.0", /* Version */ @@ -51,7 +51,7 @@ long CAP_NOTIFY = 0L; long CAP_CHGHOST = 0L; long CAP_EXTENDED_JOIN = 0L; -MOD_INIT(cap) +MOD_INIT() { ClientCapabilityInfo c; @@ -99,12 +99,12 @@ MOD_INIT(cap) return MOD_SUCCESS; } -MOD_LOAD(cap) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(cap) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/certfp.c b/src/modules/certfp.c index b6db6a310..32aa8464f 100644 --- a/src/modules/certfp.c +++ b/src/modules/certfp.c @@ -11,7 +11,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(certfp) +ModuleHeader MOD_HEADER = { "certfp", "5.0", @@ -32,7 +32,7 @@ ModDataInfo *certfp_md; /* Module Data structure which we acquire */ #define WHOISCERTFP_STRING ":%s 276 %s %s :has client certificate fingerprint %s" -MOD_INIT(certfp) +MOD_INIT() { ModDataInfo mreq; @@ -57,13 +57,13 @@ ModDataInfo mreq; return MOD_SUCCESS; } -MOD_LOAD(certfp) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(certfp) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/censor.c b/src/modules/chanmodes/censor.c index 7dfd711af..f91adb25a 100644 --- a/src/modules/chanmodes/censor.c +++ b/src/modules/chanmodes/censor.c @@ -6,7 +6,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(censor) +ModuleHeader MOD_HEADER = { "chanmodes/censor", "4.2", @@ -32,13 +32,13 @@ ModuleInfo *ModInfo = NULL; ConfigItem_badword *conf_badword_channel = NULL; -MOD_TEST(censor) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, censor_config_test); return MOD_SUCCESS; } -MOD_INIT(censor) +MOD_INIT() { CmodeInfo req; @@ -60,13 +60,13 @@ MOD_INIT(censor) return MOD_SUCCESS; } -MOD_LOAD(censor) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(censor) +MOD_UNLOAD() { ConfigItem_badword *badword, *next; diff --git a/src/modules/chanmodes/delayjoin.c b/src/modules/chanmodes/delayjoin.c index 7d151afbc..52642a230 100644 --- a/src/modules/chanmodes/delayjoin.c +++ b/src/modules/chanmodes/delayjoin.c @@ -5,7 +5,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(delayjoin) +ModuleHeader MOD_HEADER = { "chanmodes/delayjoin", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ char *moded_prechanmsg(Client *sptr, Channel *chptr, MessageTag *mtags, char *te char *moded_serialize(ModData *m); void moded_unserialize(char *str, ModData *m); -MOD_INIT(delayjoin) +MOD_INIT() { CmodeInfo req; ModDataInfo mreq; @@ -82,12 +82,12 @@ MOD_INIT(delayjoin) return MOD_SUCCESS; } -MOD_LOAD(delayjoin) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(delayjoin) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/floodprot.c b/src/modules/chanmodes/floodprot.c index 48cd8fc54..e229846e4 100644 --- a/src/modules/chanmodes/floodprot.c +++ b/src/modules/chanmodes/floodprot.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(floodprot) +ModuleHeader MOD_HEADER = { "chanmodes/floodprot", "5.0", @@ -129,13 +129,13 @@ int floodprot_stats(Client *sptr, char *flag); void floodprot_free_removechannelmodetimer_list(ModData *m); void floodprot_free_msghash_key(ModData *m); -MOD_TEST(floodprot) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, floodprot_config_test); return MOD_SUCCESS; } -MOD_INIT(floodprot) +MOD_INIT() { CmodeInfo creq; ModDataInfo mreq; @@ -188,14 +188,14 @@ MOD_INIT(floodprot) return MOD_SUCCESS; } -MOD_LOAD(floodprot) +MOD_LOAD() { EventAdd(modinfo->handle, "modef_event", 10, 0, modef_event, NULL); floodprot_rehash_complete(); return MOD_SUCCESS; } -MOD_UNLOAD(floodprot) +MOD_UNLOAD() { SavePersistentPointer(modinfo, removechannelmodetimer_list); return MOD_SUCCESS; diff --git a/src/modules/chanmodes/history.c b/src/modules/chanmodes/history.c index 019c07686..07dd21149 100644 --- a/src/modules/chanmodes/history.c +++ b/src/modules/chanmodes/history.c @@ -5,7 +5,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(history) +ModuleHeader MOD_HEADER = { "chanmodes/history", "1.0", @@ -66,13 +66,13 @@ int history_chanmsg(Client *sptr, Channel *chptr, int sendflags, int prefix, cha int history_join(Client *cptr, Client *sptr, Channel *chptr, MessageTag *mtags, char *parv[]); EVENT(history_clean); -MOD_TEST(history) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, history_config_test); return MOD_SUCCESS; } -MOD_INIT(history) +MOD_INIT() { CmodeInfo creq; ModDataInfo mreq; @@ -101,13 +101,13 @@ MOD_INIT(history) return MOD_SUCCESS; } -MOD_LOAD(history) +MOD_LOAD() { EventAdd(modinfo->handle, "history_clean", HISTORY_TIMER_EVERY, 0, history_clean, NULL); return MOD_SUCCESS; } -MOD_UNLOAD(history) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/issecure.c b/src/modules/chanmodes/issecure.c index a90743adf..392bdd6f2 100644 --- a/src/modules/chanmodes/issecure.c +++ b/src/modules/chanmodes/issecure.c @@ -28,7 +28,7 @@ CMD_FUNC(issecure); -ModuleHeader MOD_HEADER(issecure) +ModuleHeader MOD_HEADER = { "chanmodes/issecure", "4.2", @@ -51,12 +51,12 @@ int issecure_chanmode(Client *cptr, Client *sptr, Channel *chptr, MessageTag *mt char *modebuf, char *parabuf, time_t sendts, int samode); -MOD_TEST(issecure) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(issecure) +MOD_INIT() { CmodeInfo req; @@ -83,12 +83,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(issecure) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(issecure) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/link.c b/src/modules/chanmodes/link.c index b35594dec..334a1d84d 100644 --- a/src/modules/chanmodes/link.c +++ b/src/modules/chanmodes/link.c @@ -21,7 +21,7 @@ #define MAX_EB_LEN 128 // Max extban length -ModuleHeader MOD_HEADER(link) = { +ModuleHeader MOD_HEADER = { "chanmodes/link", "5.0", "Channel Mode +L", @@ -60,7 +60,7 @@ int extban_link_is_banned(Client *sptr, Channel *chptr, char *ban, int type, cha int link_doforward(Client *sptr, Channel *chptr, char *linked, linkType linktype); int link_pre_localjoin_cb(Client *sptr, Channel *chptr, char *parv[]); -MOD_INIT(link) +MOD_INIT() { CmodeInfo req; ExtbanInfo req_extban; @@ -96,13 +96,13 @@ MOD_INIT(link) return MOD_SUCCESS; } -MOD_LOAD(link) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(link) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/nocolor.c b/src/modules/chanmodes/nocolor.c index 0954509a0..cb1bf692b 100644 --- a/src/modules/chanmodes/nocolor.c +++ b/src/modules/chanmodes/nocolor.c @@ -21,7 +21,7 @@ CMD_FUNC(nocolor); -ModuleHeader MOD_HEADER(nocolor) +ModuleHeader MOD_HEADER = { "chanmodes/nocolor", "4.2", @@ -38,12 +38,12 @@ char *nocolor_prechanmsg(Client *sptr, Channel *chptr, MessageTag *mtags, char * char *nocolor_prelocalpart(Client *sptr, Channel *chptr, char *comment); char *nocolor_prelocalquit(Client *sptr, char *comment); -MOD_TEST(nocolor) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(nocolor) +MOD_INIT() { CmodeInfo req; @@ -63,12 +63,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(nocolor) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nocolor) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/noctcp.c b/src/modules/chanmodes/noctcp.c index 0359732ea..9dc54cde1 100644 --- a/src/modules/chanmodes/noctcp.c +++ b/src/modules/chanmodes/noctcp.c @@ -21,7 +21,7 @@ CMD_FUNC(noctcp); -ModuleHeader MOD_HEADER(noctcp) +ModuleHeader MOD_HEADER = { "chanmodes/noctcp", "4.2", @@ -36,12 +36,12 @@ Cmode_t EXTCMODE_NOCTCP; char *noctcp_prechanmsg(Client *sptr, Channel *chptr, MessageTag *mtags, char *text, int notice); -MOD_TEST(noctcp) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(noctcp) +MOD_INIT() { CmodeInfo req; @@ -57,12 +57,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(noctcp) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(noctcp) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/noinvite.c b/src/modules/chanmodes/noinvite.c index 257b83d43..2e7443091 100644 --- a/src/modules/chanmodes/noinvite.c +++ b/src/modules/chanmodes/noinvite.c @@ -21,7 +21,7 @@ CMD_FUNC(noinvite); -ModuleHeader MOD_HEADER(noinvite) +ModuleHeader MOD_HEADER = { "chanmodes/noinvite", "4.2", @@ -37,12 +37,12 @@ Cmode_t EXTCMODE_NOINVITE; int noinvite_pre_knock(Client *sptr, Channel *chptr); int noinvite_pre_invite(Client *sptr, Client *acptr, Channel *chptr, int *override); -MOD_TEST(noinvite) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(noinvite) +MOD_INIT() { CmodeInfo req; @@ -59,12 +59,12 @@ MOD_INIT(noinvite) return MOD_SUCCESS; } -MOD_LOAD(noinvite) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(noinvite) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/nokick.c b/src/modules/chanmodes/nokick.c index c0491477e..105f322d4 100644 --- a/src/modules/chanmodes/nokick.c +++ b/src/modules/chanmodes/nokick.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nokick) +ModuleHeader MOD_HEADER = { "chanmodes/nokick", "4.2", @@ -35,12 +35,12 @@ Cmode_t EXTCMODE_NOKICK; int nokick_check (Client* sptr, Client* who, Channel *chptr, char* comment, long sptr_flags, long who_flags, char **reject_reason); -MOD_TEST(nokick) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(nokick) +MOD_INIT() { CmodeInfo req; @@ -57,12 +57,12 @@ MOD_INIT(nokick) return MOD_SUCCESS; } -MOD_LOAD(nokick) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nokick) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/noknock.c b/src/modules/chanmodes/noknock.c index 898e15053..9a6ff8aac 100644 --- a/src/modules/chanmodes/noknock.c +++ b/src/modules/chanmodes/noknock.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(noknock) +ModuleHeader MOD_HEADER = { "chanmodes/noknock", "4.2", @@ -36,12 +36,12 @@ int noknock_check (Client *sptr, Channel *chptr); int noknock_mode_allow(Client *cptr, Channel *chptr, char mode, char *para, int checkt, int what); int noknock_mode_del (Channel *chptr, int modeChar); -MOD_TEST(noknock) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(noknock) +MOD_INIT() { CmodeInfo req; @@ -59,12 +59,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(noctcp) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(noctcp) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/nonickchange.c b/src/modules/chanmodes/nonickchange.c index 6f6989d32..cbdb82462 100644 --- a/src/modules/chanmodes/nonickchange.c +++ b/src/modules/chanmodes/nonickchange.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nonickchange) +ModuleHeader MOD_HEADER = { "chanmodes/nonickchange", "4.2", @@ -35,12 +35,12 @@ Cmode_t EXTCMODE_NONICKCHANGE; int nonickchange_check (Client *sptr, Channel *chptr); -MOD_TEST(nonickchange) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(nonickchange) +MOD_INIT() { CmodeInfo req; @@ -57,12 +57,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(nonickchange) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nonickchange) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/nonotice.c b/src/modules/chanmodes/nonotice.c index c3de8b694..e7cebdce1 100644 --- a/src/modules/chanmodes/nonotice.c +++ b/src/modules/chanmodes/nonotice.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nonotice) +ModuleHeader MOD_HEADER = { "chanmodes/nonotice", "4.2", @@ -34,12 +34,12 @@ Cmode_t EXTCMODE_NONOTICE; int nonotice_check_can_send(Client *cptr, Channel *chptr, Membership *lp, char **msg, char **errmsg, int notice); -MOD_TEST(nonotice) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(nonotice) +MOD_INIT() { CmodeInfo req; @@ -55,12 +55,12 @@ MOD_INIT(nonotice) return MOD_SUCCESS; } -MOD_LOAD(nonotice) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nonotice) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/operonly.c b/src/modules/chanmodes/operonly.c index ee40c3299..f87bb324c 100644 --- a/src/modules/chanmodes/operonly.c +++ b/src/modules/chanmodes/operonly.c @@ -21,7 +21,7 @@ CMD_FUNC(operonly); -ModuleHeader MOD_HEADER(operonly) +ModuleHeader MOD_HEADER = { "chanmodes/operonly", "4.2", @@ -37,12 +37,12 @@ int operonly_check (Client *cptr, Channel *chptr, char *key, char *parv[]); int operonly_topic_allow (Client *sptr, Channel *chptr); int operonly_check_ban(Client *cptr, Channel *chptr); -MOD_TEST(operonly) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(operonly) +MOD_INIT() { CmodeInfo req; @@ -61,12 +61,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(noctcp) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(noctcp) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/permanent.c b/src/modules/chanmodes/permanent.c index 223b7cfa9..bfb1e582a 100644 --- a/src/modules/chanmodes/permanent.c +++ b/src/modules/chanmodes/permanent.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(permanent) +ModuleHeader MOD_HEADER = { "chanmodes/permanent", "4.2", @@ -61,7 +61,7 @@ int permanent_chanmode(Client *cptr, Client *sptr, Channel *chptr, MessageTag *m } /* This is called on module init, before Server Ready */ -MOD_INIT(permanent) +MOD_INIT() { CmodeInfo req; @@ -81,13 +81,13 @@ CmodeInfo req; } /* Is first run when server is 100% ready */ -MOD_LOAD(permanent) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(permanent) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/regonly.c b/src/modules/chanmodes/regonly.c index 7741e1a7d..9c04da24e 100644 --- a/src/modules/chanmodes/regonly.c +++ b/src/modules/chanmodes/regonly.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(regonly) +ModuleHeader MOD_HEADER = { "chanmodes/regonly", "4.2", @@ -36,12 +36,12 @@ Cmode_t EXTCMODE_REGONLY; int regonly_check (Client *cptr, Channel *chptr, char *key, char *parv[]); -MOD_TEST(regonly) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(regonly) +MOD_INIT() { CmodeInfo req; @@ -58,12 +58,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(regonly) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(regonly) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/regonlyspeak.c b/src/modules/chanmodes/regonlyspeak.c index b97ebd552..b7e606819 100644 --- a/src/modules/chanmodes/regonlyspeak.c +++ b/src/modules/chanmodes/regonlyspeak.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(regonlyspeak) +ModuleHeader MOD_HEADER = { "chanmodes/regonlyspeak", "4.2", @@ -37,12 +37,12 @@ static char errMsg[2048]; int regonlyspeak_can_send(Client *cptr, Channel *chptr, Membership *lp, char **msg, char **errmsg, int notice); char *regonlyspeak_part_message (Client* sptr, Channel *chptr, char* comment); -MOD_TEST(regonlyspeak) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(regonlyspeak) +MOD_INIT() { CmodeInfo req; @@ -60,12 +60,12 @@ MOD_INIT(regonlyspeak) return MOD_SUCCESS; } -MOD_LOAD(regonlyspeak) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(regonlyspeak) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/secureonly.c b/src/modules/chanmodes/secureonly.c index 9d5c8dfa5..81735c552 100644 --- a/src/modules/chanmodes/secureonly.c +++ b/src/modules/chanmodes/secureonly.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(secureonly) +ModuleHeader MOD_HEADER = { "chanmodes/secureonly", "4.2", @@ -39,12 +39,12 @@ int secureonly_check_secure(Channel* chptr); int secureonly_check_sajoin(Client *acptr, Channel* chptr, Client *sptr); int secureonly_specialcheck(Client *sptr, Channel *chptr, char *parv[]); -MOD_TEST(secureonly) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(secureonly) +MOD_INIT() { CmodeInfo req; @@ -66,12 +66,12 @@ MOD_INIT(secureonly) return MOD_SUCCESS; } -MOD_LOAD(secureonly) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(secureonly) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chanmodes/stripcolor.c b/src/modules/chanmodes/stripcolor.c index b958c6922..0bac3a43d 100644 --- a/src/modules/chanmodes/stripcolor.c +++ b/src/modules/chanmodes/stripcolor.c @@ -21,7 +21,7 @@ CMD_FUNC(stripcolor); -ModuleHeader MOD_HEADER(stripcolor) +ModuleHeader MOD_HEADER = { "chanmodes/stripcolor", "4.2", @@ -38,12 +38,12 @@ char *stripcolor_prechanmsg(Client *sptr, Channel *chptr, MessageTag *mtags, cha char *stripcolor_prelocalpart(Client *sptr, Channel *chptr, char *comment); char *stripcolor_prelocalquit(Client *sptr, char *comment); -MOD_TEST(stripcolor) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(stripcolor) +MOD_INIT() { CmodeInfo req; @@ -63,12 +63,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(stripcolor) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(stripcolor) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/channeldb.c b/src/modules/channeldb.c index 0d4d842ed..078b9444d 100644 --- a/src/modules/channeldb.c +++ b/src/modules/channeldb.c @@ -6,7 +6,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(channeldb) = { +ModuleHeader MOD_HEADER = { "channeldb", "1.0", "Stores and retrieves channel settings for persistent (+P) channels", @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(channeldb) = { #define IsMDErr(x, y, z) \ do { \ if (!(x)) { \ - config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER(y).name, ModuleGetErrorStr((z)->handle)); \ + config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER.name, ModuleGetErrorStr((z)->handle)); \ return MOD_FAILED; \ } \ } while(0) @@ -62,14 +62,14 @@ static struct cfgstruct cfg; static int channeldb_loaded = 0; -MOD_TEST(channeldb) +MOD_TEST() { memset(&cfg, 0, sizeof(cfg)); HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, channeldb_configtest); return MOD_SUCCESS; } -MOD_INIT(channeldb) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -95,18 +95,18 @@ MOD_INIT(channeldb) return MOD_SUCCESS; } -MOD_LOAD(channeldb) +MOD_LOAD() { EventAdd(modinfo->handle, "channeldb_write_channeldb", CHANNELDB_SAVE_EVERY, 0, write_channeldb_evt, NULL); if (ModuleGetError(modinfo->handle) != MODERR_NOERROR) { - config_error("A critical error occurred when loading module %s: %s", MOD_HEADER(channeldb).name, ModuleGetErrorStr(modinfo->handle)); + config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle)); return MOD_FAILED; } return MOD_SUCCESS; } -MOD_UNLOAD(channeldb) +MOD_UNLOAD() { write_channeldb(); freecfg(); diff --git a/src/modules/charsys.c b/src/modules/charsys.c index e87b2bd5d..1d37eeebb 100644 --- a/src/modules/charsys.c +++ b/src/modules/charsys.c @@ -26,7 +26,7 @@ #define ARRAY_SIZEOF(x) (sizeof((x))/sizeof((x)[0])) #endif -ModuleHeader MOD_HEADER(charsys) +ModuleHeader MOD_HEADER = { "charsys", /* Name of module */ "5.0", /* Version */ @@ -180,7 +180,7 @@ int charsys_config_run(ConfigFile *cf, ConfigEntry *ce, int type); int charsys_config_posttest(int *errs); char *_charsys_get_current_languages(void); -MOD_TEST(charsys) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAdd(modinfo->handle, EFUNC_DO_NICK_NAME, _do_nick_name); @@ -193,7 +193,7 @@ MOD_TEST(charsys) return MOD_SUCCESS; } -MOD_INIT(charsys) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, charsys_config_run); @@ -201,14 +201,14 @@ MOD_INIT(charsys) } /* Is first run when server is 100% ready */ -MOD_LOAD(charsys) +MOD_LOAD() { charsys_finish(); return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(charsys) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chghost.c b/src/modules/chghost.c index f43e3eaaf..1735a0060 100644 --- a/src/modules/chghost.c +++ b/src/modules/chghost.c @@ -26,7 +26,7 @@ CMD_FUNC(m_chghost); -ModuleHeader MOD_HEADER(chghost) +ModuleHeader MOD_HEADER = { "chghost", /* Name of module */ "5.0", /* Version */ @@ -35,20 +35,20 @@ ModuleHeader MOD_HEADER(chghost) "unrealircd-5", }; -MOD_INIT(chghost) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CHGHOST, m_chghost, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(chghost) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(chghost) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chgident.c b/src/modules/chgident.c index 4760b8f6c..82af21265 100644 --- a/src/modules/chgident.c +++ b/src/modules/chgident.c @@ -26,7 +26,7 @@ CMD_FUNC(m_chgident); -ModuleHeader MOD_HEADER(chgident) +ModuleHeader MOD_HEADER = { "chgident", /* Name of module */ "5.0", /* Version */ @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(chgident) "unrealircd-5", }; -MOD_INIT(chgident) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CHGIDENT, m_chgident, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(chgident) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(chgident) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/chgname.c b/src/modules/chgname.c index e01879fe3..98c1d8a38 100644 --- a/src/modules/chgname.c +++ b/src/modules/chgname.c @@ -25,7 +25,7 @@ CMD_FUNC(m_chgname); -ModuleHeader MOD_HEADER(chgname) +ModuleHeader MOD_HEADER = { "chgname", /* Name of module */ "5.0", /* Version */ @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(chgname) /* This is called on module init, before Server Ready */ -MOD_INIT(chgname) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CHGNAME, m_chgname, 2, M_USER|M_SERVER); CommandAdd(modinfo->handle, MSG_SVSNAME, m_chgname, 2, M_USER|M_SERVER); @@ -45,14 +45,14 @@ MOD_INIT(chgname) } /* Is first run when server is 100% ready */ -MOD_LOAD(chgname) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(chgname) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/cloak.c b/src/modules/cloak.c index cc10365c1..77018662e 100644 --- a/src/modules/cloak.c +++ b/src/modules/cloak.c @@ -48,7 +48,7 @@ static inline unsigned int downsample(char *i); Callback *cloak = NULL, *cloak_csum = NULL; -ModuleHeader MOD_HEADER(cloak) = { +ModuleHeader MOD_HEADER = { "cloak", "1.0", "Official cloaking module (md5)", @@ -56,7 +56,7 @@ ModuleHeader MOD_HEADER(cloak) = { "unrealircd-5", }; -MOD_TEST(cloak) +MOD_TEST() { cloak = CallbackAddPCharEx(modinfo->handle, CALLBACKTYPE_CLOAK_EX, hidehost); if (!cloak) @@ -75,19 +75,19 @@ MOD_TEST(cloak) return MOD_SUCCESS; } -MOD_INIT(cloak) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, cloak_config_run); return MOD_SUCCESS; } -MOD_LOAD(cloak) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(cloak) +MOD_UNLOAD() { if (cloak_key1) { diff --git a/src/modules/close.c b/src/modules/close.c index 469ffdc66..8a232de9d 100644 --- a/src/modules/close.c +++ b/src/modules/close.c @@ -26,7 +26,7 @@ CMD_FUNC(m_close); #define MSG_CLOSE "CLOSE" -ModuleHeader MOD_HEADER(close) +ModuleHeader MOD_HEADER = { "close", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(close) "unrealircd-5", }; -MOD_INIT(close) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CLOSE, m_close, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(close) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(close) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/connect.c b/src/modules/connect.c index 4ed61c9e0..e0d2551ac 100644 --- a/src/modules/connect.c +++ b/src/modules/connect.c @@ -26,7 +26,7 @@ CMD_FUNC(m_connect); #define MSG_CONNECT "CONNECT" -ModuleHeader MOD_HEADER(connect) +ModuleHeader MOD_HEADER = { "connect", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(connect) "unrealircd-5", }; -MOD_INIT(connect) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CONNECT, m_connect, MAXPARA, M_USER|M_SERVER); /* hmm.. server.. really? */ MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(connect) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(connect) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/connthrottle.c b/src/modules/connthrottle.c index 74928c7e4..29faefa5e 100644 --- a/src/modules/connthrottle.c +++ b/src/modules/connthrottle.c @@ -13,7 +13,7 @@ #define CALLBACKTYPE_REPUTATION_STARTTIME 5 #endif -ModuleHeader MOD_HEADER(connthrottle) +ModuleHeader MOD_HEADER = { "connthrottle", CONNTHROTTLE_VERSION, @@ -80,7 +80,7 @@ void rehash_dump_settings(void); void rehash_read_settings(void); EVENT(connthrottle_evt); -MOD_TEST(connthrottle) +MOD_TEST() { memset(&cfg, 0, sizeof(cfg)); memset(&ucounter, 0, sizeof(ucounter)); @@ -98,7 +98,7 @@ MOD_TEST(connthrottle) return MOD_SUCCESS; } -MOD_INIT(connthrottle) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); snprintf(rehash_dump_filename, sizeof(rehash_dump_filename), "%s/connthrottle.tmp", TMPDIR); @@ -110,14 +110,14 @@ MOD_INIT(connthrottle) return MOD_SUCCESS; } -MOD_LOAD(connthrottle) +MOD_LOAD() { rehash_read_settings(); EventAdd(modinfo->handle, "connthrottle_evt", 1, 0, connthrottle_evt, NULL); return MOD_SUCCESS; } -MOD_UNLOAD(connthrottle) +MOD_UNLOAD() { rehash_dump_settings(); return MOD_SUCCESS; diff --git a/src/modules/cycle.c b/src/modules/cycle.c index c5f1ab0b2..470419064 100644 --- a/src/modules/cycle.c +++ b/src/modules/cycle.c @@ -24,7 +24,7 @@ CMD_FUNC(m_cycle); /* Place includes here */ #define MSG_CYCLE "CYCLE" -ModuleHeader MOD_HEADER(cycle) +ModuleHeader MOD_HEADER = { "cycle", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(cycle) }; /* This is called on module init, before Server Ready */ -MOD_INIT(cycle) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_CYCLE, m_cycle, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,14 +42,14 @@ MOD_INIT(cycle) } /* Is first run when server is 100% ready */ -MOD_LOAD(cycle) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(cycle) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/dccallow.c b/src/modules/dccallow.c index 626cf4ffd..1dcd774e0 100644 --- a/src/modules/dccallow.c +++ b/src/modules/dccallow.c @@ -26,7 +26,7 @@ CMD_FUNC(m_dccallow); #define MSG_DCCALLOW "DCCALLOW" -ModuleHeader MOD_HEADER(dccallow) +ModuleHeader MOD_HEADER = { "dccallow", "5.0", @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(dccallow) "unrealircd-5", }; -MOD_INIT(dccallow) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_DCCALLOW, m_dccallow, 1, M_USER); ISupportAdd(modinfo->handle, "USERIP", NULL); @@ -43,12 +43,12 @@ MOD_INIT(dccallow) return MOD_SUCCESS; } -MOD_LOAD(dccallow) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(dccallow) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/dccdeny.c b/src/modules/dccdeny.c index 3e8c70b07..4bb470a60 100644 --- a/src/modules/dccdeny.c +++ b/src/modules/dccdeny.c @@ -26,7 +26,7 @@ CMD_FUNC(m_dccdeny); #define MSG_DCCDENY "DCCDENY" -ModuleHeader MOD_HEADER(dccdeny) +ModuleHeader MOD_HEADER = { "dccdeny", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(dccdeny) "unrealircd-5", }; -MOD_INIT(dccdeny) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_DCCDENY, m_dccdeny, 2, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(dccdeny) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(dccdeny) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/echo-message.c b/src/modules/echo-message.c index de7b01f85..96797afb6 100644 --- a/src/modules/echo-message.c +++ b/src/modules/echo-message.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(echo_message) +ModuleHeader MOD_HEADER = { "echo-message", "5.0", @@ -38,7 +38,7 @@ long CAP_ECHO_MESSAGE = 0L; int em_chanmsg(Client *sptr, Channel *chptr, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice); int em_usermsg(Client *sptr, Client *to, MessageTag *mtags, char *text, int notice); -MOD_INIT(echo_message) +MOD_INIT() { ClientCapabilityInfo cap; @@ -54,12 +54,12 @@ MOD_INIT(echo_message) return MOD_SUCCESS; } -MOD_LOAD(echo_message) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(echo_message) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/eos.c b/src/modules/eos.c index 7ac41e2b2..012c4676e 100644 --- a/src/modules/eos.c +++ b/src/modules/eos.c @@ -26,7 +26,7 @@ CMD_FUNC(m_eos); #define MSG_EOS "EOS" -ModuleHeader MOD_HEADER(eos) +ModuleHeader MOD_HEADER = { "eos", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(eos) "unrealircd-5", }; -MOD_INIT(eos) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_EOS, m_eos, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(eos) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(eos) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/account.c b/src/modules/extbans/account.c index 1e03e8ebd..daa57a6a2 100644 --- a/src/modules/extbans/account.c +++ b/src/modules/extbans/account.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(account) +ModuleHeader MOD_HEADER = { "extbans/account", "4.2", @@ -32,7 +32,7 @@ char *extban_account_conv_param(char *para); int extban_account_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(account) +MOD_INIT() { ExtbanInfo req; @@ -53,13 +53,13 @@ MOD_INIT(account) } /** Called upon module load */ -MOD_LOAD(account) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(account) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/certfp.c b/src/modules/extbans/certfp.c index 837c991c6..5deb19a50 100644 --- a/src/modules/extbans/certfp.c +++ b/src/modules/extbans/certfp.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(certfp) +ModuleHeader MOD_HEADER = { "extbans/certfp", "4.2", @@ -33,7 +33,7 @@ char *extban_certfp_conv_param(char *para); int extban_certfp_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /* Called upon module init */ -MOD_INIT(certfp) +MOD_INIT() { ExtbanInfo req; @@ -54,13 +54,13 @@ MOD_INIT(certfp) } /* Called upon module load */ -MOD_LOAD(certfp) +MOD_LOAD() { return MOD_SUCCESS; } /* Called upon unload */ -MOD_UNLOAD(account) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/inchannel.c b/src/modules/extbans/inchannel.c index 974aa4281..10cace453 100644 --- a/src/modules/extbans/inchannel.c +++ b/src/modules/extbans/inchannel.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(inchannel) +ModuleHeader MOD_HEADER = { "extbans/inchannel", "4.2", @@ -33,7 +33,7 @@ char *extban_inchannel_conv_param(char *para); int extban_inchannel_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(inchannel) +MOD_INIT() { ExtbanInfo req; @@ -54,13 +54,13 @@ MOD_INIT(inchannel) } /** Called upon module load */ -MOD_LOAD(inchannel) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(inchannel) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/join.c b/src/modules/extbans/join.c index 70fef4e8c..2762b6e2b 100644 --- a/src/modules/extbans/join.c +++ b/src/modules/extbans/join.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(join) +ModuleHeader MOD_HEADER = { "extbans/join", "4.2", @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(join) int extban_modej_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(join) +MOD_INIT() { ExtbanInfo req; @@ -52,13 +52,13 @@ MOD_INIT(join) } /** Called upon module load */ -MOD_LOAD(join) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(join) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/msgbypass.c b/src/modules/extbans/msgbypass.c index 982df0c1e..5f5c246b7 100644 --- a/src/modules/extbans/msgbypass.c +++ b/src/modules/extbans/msgbypass.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(msgbypass) +ModuleHeader MOD_HEADER = { "extbans/msgbypass", "4.2", @@ -34,7 +34,7 @@ int msgbypass_extban_is_ok(Client* sptr, Channel* chptr, char* para, int checkt, char *msgbypass_extban_conv_param(char *para); /** Called upon module init */ -MOD_INIT(msgbypass) +MOD_INIT() { ExtbanInfo req; @@ -55,14 +55,14 @@ MOD_INIT(msgbypass) } /** Called upon module load */ -MOD_LOAD(msgbypass) +MOD_LOAD() { HookAdd(modinfo->handle, HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION, 0, msgbypass_can_bypass); return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(msgbypass) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/nickchange.c b/src/modules/extbans/nickchange.c index f374c2303..332dd72ad 100644 --- a/src/modules/extbans/nickchange.c +++ b/src/modules/extbans/nickchange.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nickchange) +ModuleHeader MOD_HEADER = { "extbans/nickchange", "4.2", @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(nickchange) int extban_nickchange_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(nickchange) +MOD_INIT() { ExtbanInfo req; @@ -52,13 +52,13 @@ MOD_INIT(nickchange) } /** Called upon module load */ -MOD_LOAD(nickchange) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(nickchange) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/operclass.c b/src/modules/extbans/operclass.c index 35f488071..dc9d0ce1e 100644 --- a/src/modules/extbans/operclass.c +++ b/src/modules/extbans/operclass.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(operclass) +ModuleHeader MOD_HEADER = { "extbans/operclass", "4.2", @@ -32,7 +32,7 @@ char *extban_operclass_conv_param(char *para); int extban_operclass_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(operclass) +MOD_INIT() { ExtbanInfo req; @@ -53,13 +53,13 @@ MOD_INIT(operclass) } /** Called upon module load */ -MOD_LOAD(operclass) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(operclass) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/partmsg.c b/src/modules/extbans/partmsg.c index cb8c30790..e3fb43981 100644 --- a/src/modules/extbans/partmsg.c +++ b/src/modules/extbans/partmsg.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(partmsg) +ModuleHeader MOD_HEADER = { "extbans/partmsg", "4.2", @@ -30,7 +30,7 @@ ModuleHeader MOD_HEADER(partmsg) int extban_partmsg_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); -MOD_INIT(partmsg) +MOD_INIT() { ExtbanInfo req; @@ -51,13 +51,13 @@ MOD_INIT(partmsg) } /** Called upon module load */ -MOD_LOAD(partmsg) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(partmsg) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/quiet.c b/src/modules/extbans/quiet.c index 03103313b..c7d97a619 100644 --- a/src/modules/extbans/quiet.c +++ b/src/modules/extbans/quiet.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(quiet) +ModuleHeader MOD_HEADER = { "extbans/quiet", "4.2", @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(quiet) int extban_quiet_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(quiet) +MOD_INIT() { ExtbanInfo req; @@ -52,13 +52,13 @@ MOD_INIT(quiet) } /** Called upon module load */ -MOD_LOAD(quiet) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(quiet) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/realname.c b/src/modules/extbans/realname.c index 3c2c3eb85..2ba260996 100644 --- a/src/modules/extbans/realname.c +++ b/src/modules/extbans/realname.c @@ -18,7 +18,7 @@ */ #include "unrealircd.h" -ModuleHeader MOD_HEADER(realname) +ModuleHeader MOD_HEADER = { "extbans/realname", "4.2", @@ -32,7 +32,7 @@ char *extban_realname_conv_param(char *para); int extban_realname_is_banned(Client *sptr, Channel *chptr, char *banin, int type, char **msg, char **errmsg); /** Called upon module init */ -MOD_INIT(realname) +MOD_INIT() { ExtbanInfo req; @@ -53,13 +53,13 @@ MOD_INIT(realname) } /** Called upon module load */ -MOD_LOAD(realname) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(realname) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/textban.c b/src/modules/extbans/textban.c index 844528393..267739fde 100644 --- a/src/modules/extbans/textban.c +++ b/src/modules/extbans/textban.c @@ -70,7 +70,7 @@ #undef BENCHMARK -ModuleHeader MOD_HEADER(textban) +ModuleHeader MOD_HEADER = { "extbans/textban", "2.2", @@ -85,7 +85,7 @@ int extban_modeT_is_banned(Client *sptr, Channel *chptr, char *ban, int type, ch int extban_modeT_is_ok(Client *sptr, Channel *chptr, char *para, int checkt, int what, int what2); void parse_word(const char *s, char **word, int *type); -MOD_INIT(textban) +MOD_INIT() { ExtbanInfo req; @@ -106,12 +106,12 @@ MOD_INIT(textban) return MOD_SUCCESS; } -MOD_LOAD(textban) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(textban) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/extbans/timedban.c b/src/modules/extbans/timedban.c index e8e2de46f..ca8653a6e 100644 --- a/src/modules/extbans/timedban.c +++ b/src/modules/extbans/timedban.c @@ -45,7 +45,7 @@ */ #define TIMEDBAN_TIMER_DELTA ((TIMEDBAN_TIMER_ITERATION_SPLIT*TIMEDBAN_TIMER)/2) -ModuleHeader MOD_HEADER(timedban) +ModuleHeader MOD_HEADER = { "extbans/timedban", "1.0", @@ -63,12 +63,12 @@ char *timedban_chanmsg(Client *, Client *, Channel *, char *, int); EVENT(timedban_timeout); -MOD_TEST(timedban) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(timedban) +MOD_INIT() { ExtbanInfo extban; @@ -94,12 +94,12 @@ ExtbanInfo extban; return MOD_SUCCESS; } -MOD_LOAD(timedban) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(timedban) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/globops.c b/src/modules/globops.c index 497a62aea..84c7f6e8a 100644 --- a/src/modules/globops.c +++ b/src/modules/globops.c @@ -26,7 +26,7 @@ CMD_FUNC(m_globops); #define MSG_GLOBOPS "GLOBOPS" -ModuleHeader MOD_HEADER(globops) +ModuleHeader MOD_HEADER = { "globops", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(globops) "unrealircd-5", }; -MOD_INIT(globops) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_GLOBOPS, m_globops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(globops) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(globops) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/help.c b/src/modules/help.c index 96fa23517..616309e79 100644 --- a/src/modules/help.c +++ b/src/modules/help.c @@ -27,7 +27,7 @@ CMD_FUNC(m_help); #define MSG_HELP "HELP" #define MSG_HELPOP "HELPOP" -ModuleHeader MOD_HEADER(help) +ModuleHeader MOD_HEADER = { "help", "5.0", @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(help) "unrealircd-5", }; -MOD_INIT(help) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_HELP, m_help, 1, M_USER); CommandAdd(modinfo->handle, MSG_HELPOP, m_help, 1, M_USER); @@ -44,12 +44,12 @@ MOD_INIT(help) return MOD_SUCCESS; } -MOD_LOAD(help) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(help) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/hideserver.c b/src/modules/hideserver.c index d305131ac..c01dcc616 100644 --- a/src/modules/hideserver.c +++ b/src/modules/hideserver.c @@ -43,7 +43,7 @@ static ModuleInfo *MyModInfo; #define MyMod MyModInfo->handle #define SAVE_MODINFO MyModInfo = modinfo; -ModuleHeader MOD_HEADER(hideserver) +ModuleHeader MOD_HEADER = { "hideserver", "5.0", @@ -73,7 +73,7 @@ static void FreeConf() } } -MOD_TEST(hideserver) +MOD_TEST() { SAVE_MODINFO HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cb_test); @@ -81,7 +81,7 @@ MOD_TEST(hideserver) return MOD_SUCCESS; } -MOD_INIT(hideserver) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); SAVE_MODINFO @@ -93,7 +93,7 @@ MOD_INIT(hideserver) return MOD_SUCCESS; } -MOD_LOAD(hideserver) +MOD_LOAD() { if (!CommandOverrideAdd(MyMod, "MAP", override_map)) return MOD_FAILED; @@ -104,7 +104,7 @@ MOD_LOAD(hideserver) return MOD_SUCCESS; } -MOD_UNLOAD(hideserver) +MOD_UNLOAD() { FreeConf(); diff --git a/src/modules/history_backend_mem.c b/src/modules/history_backend_mem.c index ac454f820..6e57a8336 100644 --- a/src/modules/history_backend_mem.c +++ b/src/modules/history_backend_mem.c @@ -11,7 +11,7 @@ * are executed as fast as possible. */ -ModuleHeader MOD_HEADER(history_backend_mem) +ModuleHeader MOD_HEADER = { "history_backend_mem", "1.0", @@ -53,7 +53,7 @@ int hbm_history_del(char *object, int max_lines, long max_time); int hbm_history_request(Client *acptr, char *object, HistoryFilter *filter); int hbm_history_destroy(char *object); -MOD_INIT(history_backend_mem) +MOD_INIT() { HistoryBackendInfo hbi; @@ -75,12 +75,12 @@ MOD_INIT(history_backend_mem) return MOD_SUCCESS; } -MOD_LOAD(history_backend_mem) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(history_backend_mem) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/history_backend_null.c b/src/modules/history_backend_null.c index 291ec1d9e..6c524006d 100644 --- a/src/modules/history_backend_null.c +++ b/src/modules/history_backend_null.c @@ -10,7 +10,7 @@ * channel mode +H. */ -ModuleHeader MOD_HEADER(history_backend_null) +ModuleHeader MOD_HEADER = { "history_backend_null", "1.0", @@ -25,7 +25,7 @@ int hbn_history_del(char *object, int max_lines, long max_time); int hbn_history_request(Client *acptr, char *object, HistoryFilter *filter); int hbn_history_destroy(char *object); -MOD_INIT(history_backend_null) +MOD_INIT() { HistoryBackendInfo hbi; @@ -44,12 +44,12 @@ MOD_INIT(history_backend_null) return MOD_SUCCESS; } -MOD_LOAD(history_backend_null) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(history_backend_null) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/invite.c b/src/modules/invite.c index 2a51db4f2..c222edd3e 100644 --- a/src/modules/invite.c +++ b/src/modules/invite.c @@ -26,7 +26,7 @@ CMD_FUNC(m_invite); #define MSG_INVITE "INVITE" -ModuleHeader MOD_HEADER(invite) +ModuleHeader MOD_HEADER = { "invite", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(invite) "unrealircd-5", }; -MOD_INIT(invite) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_INVITE, m_invite, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(invite) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(invite) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/ircops.c b/src/modules/ircops.c index 23d967117..a977f9178 100644 --- a/src/modules/ircops.c +++ b/src/modules/ircops.c @@ -25,7 +25,7 @@ CMD_FUNC(m_ircops); -ModuleHeader MOD_HEADER(ircops) +ModuleHeader MOD_HEADER = { "ircops", "3.71", @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(ircops) "unrealircd-5", }; -MOD_INIT(ircops) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); if (CommandExists(MSG_IRCOPS)) @@ -54,12 +54,12 @@ MOD_INIT(ircops) return MOD_SUCCESS; } -MOD_LOAD(ircops) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(ircops) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/ison.c b/src/modules/ison.c index 0b0180f40..1ef0ce109 100644 --- a/src/modules/ison.c +++ b/src/modules/ison.c @@ -26,7 +26,7 @@ CMD_FUNC(m_ison); #define MSG_ISON "ISON" -ModuleHeader MOD_HEADER(ison) +ModuleHeader MOD_HEADER = { "ison", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(ison) "unrealircd-5", }; -MOD_INIT(ison) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_ISON, m_ison, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(ison) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(ison) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/join.c b/src/modules/join.c index 3e8010724..93fb99021 100644 --- a/src/modules/join.c +++ b/src/modules/join.c @@ -42,7 +42,7 @@ static int bouncedtimes = 0; #define MAXBOUNCE 5 /** Most sensible */ #define MSG_JOIN "JOIN" -ModuleHeader MOD_HEADER(join) +ModuleHeader MOD_HEADER = { "join", "5.0", @@ -51,7 +51,7 @@ ModuleHeader MOD_HEADER(join) "unrealircd-5", }; -MOD_TEST(join) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddVoid(modinfo->handle, EFUNC_JOIN_CHANNEL, _join_channel); @@ -64,19 +64,19 @@ MOD_TEST(join) return MOD_SUCCESS; } -MOD_INIT(join) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_JOIN, m_join, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(join) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(join) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/jointhrottle.c b/src/modules/jointhrottle.c index db68b864c..901f2a943 100644 --- a/src/modules/jointhrottle.c +++ b/src/modules/jointhrottle.c @@ -27,7 +27,7 @@ #define JOINTHROTTLE_DEFAULT_COUNT 3 #define JOINTHROTTLE_DEFAULT_TIME 90 -ModuleHeader MOD_HEADER(jointhrottle) +ModuleHeader MOD_HEADER = { "jointhrottle", "5.0", @@ -65,13 +65,13 @@ static void jointhrottle_increase_usercounter(Client *cptr, Channel *chptr); EVENT(jointhrottle_cleanup_structs); JoinFlood *jointhrottle_addentry(Client *cptr, Channel *chptr); -MOD_TEST(jointhrottle) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, jointhrottle_config_test); return MOD_SUCCESS; } -MOD_INIT(jointhrottle) +MOD_INIT() { ModDataInfo mreq; @@ -98,13 +98,13 @@ MOD_INIT(jointhrottle) return MOD_SUCCESS; } -MOD_LOAD(jointhrottle) +MOD_LOAD() { EventAdd(ModInfo->handle, "jointhrottle_cleanup_structs", 60, 0, jointhrottle_cleanup_structs, NULL); return MOD_SUCCESS; } -MOD_UNLOAD(jointhrottle) +MOD_UNLOAD() { return MOD_FAILED; } diff --git a/src/modules/jumpserver.c b/src/modules/jumpserver.c index d24f9fc32..e79a661ec 100644 --- a/src/modules/jumpserver.c +++ b/src/modules/jumpserver.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(jumpserver) +ModuleHeader MOD_HEADER = { "jumpserver", "1.1", @@ -49,7 +49,7 @@ struct JSS JSS *jss=NULL; /**< JumpServer Status. NULL=disabled. */ -MOD_INIT(jumpserver) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); LoadPersistentPointer(modinfo, jss, jumpserver_free_jss); @@ -58,12 +58,12 @@ MOD_INIT(jumpserver) return MOD_SUCCESS; } -MOD_LOAD(jumpserver) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(jumpserver) +MOD_UNLOAD() { SavePersistentPointer(modinfo, jss); return MOD_SUCCESS; diff --git a/src/modules/kick.c b/src/modules/kick.c index 50d863813..b297be3e8 100644 --- a/src/modules/kick.c +++ b/src/modules/kick.c @@ -26,7 +26,7 @@ CMD_FUNC(m_kick); #define MSG_KICK "KICK" -ModuleHeader MOD_HEADER(kick) +ModuleHeader MOD_HEADER = { "kick", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(kick) "unrealircd-5", }; -MOD_INIT(kick) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_KICK, m_kick, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(kick) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(kick) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/kill.c b/src/modules/kill.c index fca2174b0..aaa497635 100644 --- a/src/modules/kill.c +++ b/src/modules/kill.c @@ -26,7 +26,7 @@ static char buf[BUFSIZE], buf2[BUFSIZE]; /* Place includes here */ #define MSG_KILL "KILL" /* KILL */ -ModuleHeader MOD_HEADER(kill) +ModuleHeader MOD_HEADER = { "kill", /* Name of module */ "5.0", /* Version */ @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(kill) }; /* This is called on module init, before Server Ready */ -MOD_INIT(kill) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_KILL, m_kill, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -44,14 +44,14 @@ MOD_INIT(kill) } /* Is first run when server is 100% ready */ -MOD_LOAD(kill) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(kill) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/knock.c b/src/modules/knock.c index a36659dca..51f54d5ce 100644 --- a/src/modules/knock.c +++ b/src/modules/knock.c @@ -26,7 +26,7 @@ CMD_FUNC(m_knock); #define MSG_KNOCK "KNOCK" -ModuleHeader MOD_HEADER(knock) +ModuleHeader MOD_HEADER = { "knock", "5.0", @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(knock) "unrealircd-5", }; -MOD_INIT(knock) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_KNOCK, m_knock, 2, M_USER); ISupportAdd(modinfo->handle, "KNOCK", NULL); @@ -43,12 +43,12 @@ MOD_INIT(knock) return MOD_SUCCESS; } -MOD_LOAD(knock) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(knock) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/labeled-response.c b/src/modules/labeled-response.c index c9bb7a8a2..38d8e1bd3 100644 --- a/src/modules/labeled-response.c +++ b/src/modules/labeled-response.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(labeled-response) +ModuleHeader MOD_HEADER = { "labeled-response", "5.0", @@ -53,7 +53,7 @@ long CAP_LABELED_RESPONSE = 0L; int labeled_response_mtag_is_ok(Client *acptr, char *name, char *value); -MOD_INIT(labeled-response) +MOD_INIT() { ClientCapabilityInfo cap; ClientCapability *c; @@ -81,12 +81,12 @@ MOD_INIT(labeled-response) return MOD_SUCCESS; } -MOD_LOAD(labeled-response) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(labeled-response) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/lag.c b/src/modules/lag.c index 66a0ddf4f..48eb2494d 100644 --- a/src/modules/lag.c +++ b/src/modules/lag.c @@ -25,7 +25,7 @@ CMD_FUNC(m_lag); /* Place includes here */ #define MSG_LAG "LAG" /* Lag detect */ -ModuleHeader MOD_HEADER(lag) +ModuleHeader MOD_HEADER = { "lag", /* Name of module */ "5.0", /* Version */ @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(lag) }; /* This is called on module init, before Server Ready */ -MOD_INIT(lag) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_LAG, m_lag, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -43,13 +43,13 @@ MOD_INIT(lag) } /* Is first run when server is 100% ready */ -MOD_LOAD(lag) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(lag) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/link-security.c b/src/modules/link-security.c index d22cdc93a..e4a4e4ddc 100644 --- a/src/modules/link-security.c +++ b/src/modules/link-security.c @@ -23,7 +23,7 @@ #include "unrealircd.h" /* Module header */ -ModuleHeader MOD_HEADER(link_security) +ModuleHeader MOD_HEADER = { "link-security", "5.0", @@ -46,7 +46,7 @@ int global_link_security = -1; int effective_link_security = -1; /** Module initalization */ -MOD_INIT(link_security) +MOD_INIT() { ModDataInfo mreq; @@ -71,7 +71,7 @@ MOD_INIT(link_security) return MOD_SUCCESS; } -MOD_LOAD(link_security) +MOD_LOAD() { ClientCapabilityInfo cap; @@ -86,7 +86,7 @@ MOD_LOAD(link_security) return MOD_SUCCESS; } -MOD_UNLOAD(link_security) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/links.c b/src/modules/links.c index 2e92955ce..53f1ddbad 100644 --- a/src/modules/links.c +++ b/src/modules/links.c @@ -26,7 +26,7 @@ CMD_FUNC(m_links); #define MSG_LINKS "LINKS" -ModuleHeader MOD_HEADER(links) +ModuleHeader MOD_HEADER = { "links", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(links) "unrealircd-5", }; -MOD_INIT(links) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_LINKS, m_links, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(links) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(links) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/list.c b/src/modules/list.c index c2e11727b..df8ec8362 100644 --- a/src/modules/list.c +++ b/src/modules/list.c @@ -27,7 +27,7 @@ void _send_list(Client *cptr); #define MSG_LIST "LIST" -ModuleHeader MOD_HEADER(list) +ModuleHeader MOD_HEADER = { "list", "5.0", @@ -38,14 +38,14 @@ ModuleHeader MOD_HEADER(list) EVENT(send_queued_list_data); -MOD_TEST(list) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddVoid(modinfo->handle, EFUNC_SEND_LIST, _send_list); return MOD_SUCCESS; } -MOD_INIT(list) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_LIST, m_list, MAXPARA, M_USER); EventAdd(modinfo->handle, "send_queued_list_data", 1, 0, send_queued_list_data, NULL); @@ -53,12 +53,12 @@ MOD_INIT(list) return MOD_SUCCESS; } -MOD_LOAD(list) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(list) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/locops.c b/src/modules/locops.c index c2c985d42..c9d5568ad 100644 --- a/src/modules/locops.c +++ b/src/modules/locops.c @@ -26,7 +26,7 @@ CMD_FUNC(m_locops); #define MSG_LOCOPS "LOCOPS" -ModuleHeader MOD_HEADER(locops) +ModuleHeader MOD_HEADER = { "locops", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(locops) "unrealircd-5", }; -MOD_INIT(locops) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_LOCOPS, m_locops, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(locops) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(locops) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/lusers.c b/src/modules/lusers.c index 6caab5333..2481a016b 100644 --- a/src/modules/lusers.c +++ b/src/modules/lusers.c @@ -26,7 +26,7 @@ CMD_FUNC(m_lusers); #define MSG_LUSERS "LUSERS" -ModuleHeader MOD_HEADER(lusers) +ModuleHeader MOD_HEADER = { "lusers", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(lusers) "unrealircd-5", }; -MOD_INIT(lusers) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_LUSERS, m_lusers, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(lusers) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(lusers) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/map.c b/src/modules/map.c index 855c32fc9..ad34f1c38 100644 --- a/src/modules/map.c +++ b/src/modules/map.c @@ -26,7 +26,7 @@ CMD_FUNC(m_map); #define MSG_MAP "MAP" -ModuleHeader MOD_HEADER(map) +ModuleHeader MOD_HEADER = { "map", "5.0", @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(map) "unrealircd-5", }; -MOD_INIT(map) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_MAP, m_map, MAXPARA, M_USER); ISupportAdd(modinfo->handle, "MAP", NULL); @@ -43,12 +43,12 @@ MOD_INIT(map) return MOD_SUCCESS; } -MOD_LOAD(map) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(map) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/md.c b/src/modules/md.c index 7bf3b2941..830eae52d 100644 --- a/src/modules/md.c +++ b/src/modules/md.c @@ -8,7 +8,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(md) +ModuleHeader MOD_HEADER = { "md", "5.0", @@ -35,7 +35,7 @@ void _broadcast_moddata_client(Client *acptr); extern MODVAR ModDataInfo *MDInfo; -MOD_TEST(md) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_CLIENT, _broadcast_md_client); @@ -55,19 +55,19 @@ MOD_TEST(md) return MOD_SUCCESS; } -MOD_INIT(md) +MOD_INIT() { CommandAdd(modinfo->handle, "MD", m_md, MAXPARA, M_SERVER); return MOD_SUCCESS; } -MOD_LOAD(md) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(md) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/mdex.c b/src/modules/mdex.c index ceeac406e..b1eae0b4a 100644 --- a/src/modules/mdex.c +++ b/src/modules/mdex.c @@ -10,7 +10,7 @@ CMD_FUNC(m_mdex); -ModuleHeader MOD_HEADER(mdex) +ModuleHeader MOD_HEADER = { "mdex", "5.0", @@ -24,7 +24,7 @@ void mdex_free(ModData *m); char *mdex_serialize(ModData *m); void mdex_unserialize(char *str, ModData *m); -MOD_INIT(mdex) +MOD_INIT() { ModDataInfo mreq; @@ -56,13 +56,13 @@ ModDataInfo mreq; return MOD_SUCCESS; } -MOD_LOAD(mdex) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(mdex) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/message-ids.c b/src/modules/message-ids.c index 98fa4ed26..71737a46c 100644 --- a/src/modules/message-ids.c +++ b/src/modules/message-ids.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(message-ids) +ModuleHeader MOD_HEADER = { "message-ids", "5.0", @@ -45,7 +45,7 @@ long CAP_ACCOUNT_TAG = 0L; int msgid_mtag_is_ok(Client *acptr, char *name, char *value); void mtag_add_or_inherit_msgid(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature); -MOD_INIT(message-ids) +MOD_INIT() { MessageTagHandlerInfo mtag; @@ -62,12 +62,12 @@ MOD_INIT(message-ids) return MOD_SUCCESS; } -MOD_LOAD(message-ids) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(message-ids) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/message-tags.c b/src/modules/message-tags.c index 6190488df..af8892ba6 100644 --- a/src/modules/message-tags.c +++ b/src/modules/message-tags.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(message-tags) +ModuleHeader MOD_HEADER = { "message-tags", "5.0", @@ -36,7 +36,7 @@ char *_mtags_to_string(MessageTag *m, Client *acptr); void _parse_message_tags(Client *cptr, char **str, MessageTag **mtag_list); CMD_FUNC(m_tagmsg); -MOD_TEST(message-tags) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -46,7 +46,7 @@ MOD_TEST(message-tags) return 0; } -MOD_INIT(message-tags) +MOD_INIT() { ClientCapabilityInfo cap; @@ -59,12 +59,12 @@ MOD_INIT(message-tags) return MOD_SUCCESS; } -MOD_LOAD(message-tags) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(message-tags) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/message.c b/src/modules/message.c index 91662026e..92fbb1b6b 100644 --- a/src/modules/message.c +++ b/src/modules/message.c @@ -35,7 +35,7 @@ int _can_send(Client *cptr, Channel *chptr, char **msgtext, char **errmsg, int n #define MSG_PRIVATE "PRIVMSG" /* PRIV */ #define MSG_NOTICE "NOTICE" /* NOTI */ -ModuleHeader MOD_HEADER(message) +ModuleHeader MOD_HEADER = { "message", /* Name of module */ "5.0", /* Version */ @@ -44,7 +44,7 @@ ModuleHeader MOD_HEADER(message) "unrealircd-5", }; -MOD_TEST(message) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddPChar(modinfo->handle, EFUNC_STRIPCOLORS, _StripColors); @@ -55,7 +55,7 @@ MOD_TEST(message) } /* This is called on module init, before Server Ready */ -MOD_INIT(message) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS); CommandAdd(modinfo->handle, MSG_NOTICE, m_notice, 2, M_USER|M_SERVER); @@ -64,13 +64,13 @@ MOD_INIT(message) } /* Is first run when server is 100% ready */ -MOD_LOAD(message) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(message) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/mkpasswd.c b/src/modules/mkpasswd.c index 9900830ed..ba25c971e 100644 --- a/src/modules/mkpasswd.c +++ b/src/modules/mkpasswd.c @@ -28,7 +28,7 @@ CMD_FUNC(m_mkpasswd); #define MSG_MKPASSWD "MKPASSWD" -ModuleHeader MOD_HEADER(mkpasswd) +ModuleHeader MOD_HEADER = { "mkpasswd", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(mkpasswd) "unrealircd-5", }; -MOD_INIT(mkpasswd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_MKPASSWD, m_mkpasswd, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(mkpasswd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(mkpasswd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/mode.c b/src/modules/mode.c index 15327d52b..f56b7d306 100644 --- a/src/modules/mode.c +++ b/src/modules/mode.c @@ -49,7 +49,7 @@ static int samode_in_progress = 0; #define MSG_MODE "MODE" -ModuleHeader MOD_HEADER(mode) +ModuleHeader MOD_HEADER = { "mode", "5.0", @@ -58,7 +58,7 @@ ModuleHeader MOD_HEADER(mode) "unrealircd-5", }; -MOD_TEST(mode) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddVoid(modinfo->handle, EFUNC_DO_MODE, _do_mode); @@ -67,7 +67,7 @@ MOD_TEST(mode) return MOD_SUCCESS; } -MOD_INIT(mode) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_MODE, m_mode, MAXPARA, M_USER|M_SERVER); CommandAdd(modinfo->handle, MSG_MLOCK, m_mlock, MAXPARA, M_SERVER); @@ -75,12 +75,12 @@ MOD_INIT(mode) return MOD_SUCCESS; } -MOD_LOAD(mode) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(mode) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/motd.c b/src/modules/motd.c index 51b660360..8a576349b 100644 --- a/src/modules/motd.c +++ b/src/modules/motd.c @@ -26,7 +26,7 @@ CMD_FUNC(m_motd); #define MSG_MOTD "MOTD" -ModuleHeader MOD_HEADER(motd) +ModuleHeader MOD_HEADER = { "motd", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(motd) "unrealircd-5", }; -MOD_INIT(motd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_MOTD, m_motd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(motd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(motd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/names.c b/src/modules/names.c index 0eb827411..6e2ee6810 100644 --- a/src/modules/names.c +++ b/src/modules/names.c @@ -26,7 +26,7 @@ CMD_FUNC(m_names); #define MSG_NAMES "NAMES" -ModuleHeader MOD_HEADER(names) +ModuleHeader MOD_HEADER = { "names", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(names) "unrealircd-5", }; -MOD_INIT(names) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_NAMES, m_names, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(names) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(names) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/netinfo.c b/src/modules/netinfo.c index 8aca37006..d09fbd569 100644 --- a/src/modules/netinfo.c +++ b/src/modules/netinfo.c @@ -26,7 +26,7 @@ CMD_FUNC(m_netinfo); #define MSG_NETINFO "NETINFO" -ModuleHeader MOD_HEADER(netinfo) +ModuleHeader MOD_HEADER = { "netinfo", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(netinfo) "unrealircd-5", }; -MOD_INIT(netinfo) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_NETINFO, m_netinfo, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(netinfo) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(netinfo) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/nick.c b/src/modules/nick.c index 0e378c104..5e5c55fda 100644 --- a/src/modules/nick.c +++ b/src/modules/nick.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nick) +ModuleHeader MOD_HEADER = { "nick", "5.0", @@ -40,14 +40,14 @@ int _register_user(Client *cptr, Client *sptr, char *nick, char *username, char int AllowClient(Client *cptr, struct hostent *hp, char *sockhost, char *username); int check_client(Client *cptr, char *username); -MOD_TEST(nick) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAdd(modinfo->handle, EFUNC_REGISTER_USER, _register_user); return MOD_SUCCESS; } -MOD_INIT(nick) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_NICK, m_nick, MAXPARA, M_USER|M_SERVER|M_UNREGISTERED); CommandAdd(modinfo->handle, "UID", m_uid, MAXPARA, M_SERVER); @@ -55,12 +55,12 @@ MOD_INIT(nick) return MOD_SUCCESS; } -MOD_LOAD(nick) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nick) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/nocodes.c b/src/modules/nocodes.c index 041e19790..10965684f 100644 --- a/src/modules/nocodes.c +++ b/src/modules/nocodes.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(nocodes) +ModuleHeader MOD_HEADER = { "nocodes", /* Name of module */ "1.2", /* Version */ @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(nocodes) char *nocodes_pre_chanmsg(Client *sptr, Channel *chptr, MessageTag *mtags, char *text, int notice); -MOD_INIT(nocodes) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -39,12 +39,12 @@ MOD_INIT(nocodes) return MOD_SUCCESS; } -MOD_LOAD(nocodes) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nocodes) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/oper.c b/src/modules/oper.c index a03302714..c4d1f2138 100644 --- a/src/modules/oper.c +++ b/src/modules/oper.c @@ -26,7 +26,7 @@ CMD_FUNC(m_oper); /* Place includes here */ #define MSG_OPER "OPER" /* OPER */ -ModuleHeader MOD_HEADER(oper) +ModuleHeader MOD_HEADER = { "oper", /* Name of module */ "5.0", /* Version */ @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(oper) }; /* This is called on module init, before Server Ready */ -MOD_INIT(oper) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_OPER, m_oper, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -44,13 +44,13 @@ MOD_INIT(oper) } /* Is first run when server is 100% ready */ -MOD_LOAD(oper) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(oper) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/opermotd.c b/src/modules/opermotd.c index 5d25f8959..6986cdc3d 100644 --- a/src/modules/opermotd.c +++ b/src/modules/opermotd.c @@ -26,7 +26,7 @@ CMD_FUNC(m_opermotd); #define MSG_OPERMOTD "OPERMOTD" -ModuleHeader MOD_HEADER(opermotd) +ModuleHeader MOD_HEADER = { "opermotd", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(opermotd) "unrealircd-5", }; -MOD_INIT(opermotd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_OPERMOTD, m_opermotd, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(opermotd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(opermotd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/part.c b/src/modules/part.c index bdddf6491..056a0920f 100644 --- a/src/modules/part.c +++ b/src/modules/part.c @@ -26,7 +26,7 @@ CMD_FUNC(m_part); #define MSG_PART "PART" -ModuleHeader MOD_HEADER(part) +ModuleHeader MOD_HEADER = { "part", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(part) "unrealircd-5", }; -MOD_INIT(part) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_PART, m_part, 2, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(part) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(part) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/pass.c b/src/modules/pass.c index bb892de50..a5f3d4947 100644 --- a/src/modules/pass.c +++ b/src/modules/pass.c @@ -26,7 +26,7 @@ CMD_FUNC(m_pass); #define MSG_PASS "PASS" -ModuleHeader MOD_HEADER(pass) +ModuleHeader MOD_HEADER = { "pass", "5.0", @@ -38,7 +38,7 @@ ModuleHeader MOD_HEADER(pass) /* Forward declarations */ int _check_banned(Client *cptr, int exitflags); -MOD_TEST(pass) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -47,7 +47,7 @@ MOD_TEST(pass) return MOD_SUCCESS; } -MOD_INIT(pass) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER); @@ -55,12 +55,12 @@ MOD_INIT(pass) return MOD_SUCCESS; } -MOD_LOAD(pass) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(pass) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/pingpong.c b/src/modules/pingpong.c index cf7a5d44c..e44de2303 100644 --- a/src/modules/pingpong.c +++ b/src/modules/pingpong.c @@ -28,7 +28,7 @@ CMD_FUNC(m_nospoof); #define MSG_PING "PING" /* PING */ #define MSG_PONG "PONG" /* PONG */ -ModuleHeader MOD_HEADER(pingpong) +ModuleHeader MOD_HEADER = { "pingpong", /* Name of module */ "5.0", /* Version */ @@ -37,7 +37,7 @@ ModuleHeader MOD_HEADER(pingpong) "unrealircd-5", }; /* This is called on module init, before Server Ready */ -MOD_INIT(pingpong) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_PING, m_ping, MAXPARA, M_USER|M_SERVER|M_SHUN); CommandAdd(modinfo->handle, MSG_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS); @@ -46,14 +46,14 @@ MOD_INIT(pingpong) } /* Is first run when server is 100% ready */ -MOD_LOAD(pingpong) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(pingpong) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/plaintext-policy.c b/src/modules/plaintext-policy.c index 91217f6fe..ce98eeef5 100644 --- a/src/modules/plaintext-policy.c +++ b/src/modules/plaintext-policy.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(plaintext_policy) +ModuleHeader MOD_HEADER = { "plaintext-policy", "5.0", @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(plaintext_policy) "unrealircd-5", }; -MOD_INIT(plaintext_policy) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -40,14 +40,14 @@ MOD_INIT(plaintext_policy) void init_plaintext_policy(ModuleInfo *modinfo); -MOD_LOAD(plaintext_policy) +MOD_LOAD() { /* init_plaintext_policy is delayed to MOD_LOAD due to configuration dependency */ init_plaintext_policy(modinfo); return MOD_SUCCESS; } -MOD_UNLOAD(plaintext_policy) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/protoctl.c b/src/modules/protoctl.c index a8726ac87..8874b2d43 100644 --- a/src/modules/protoctl.c +++ b/src/modules/protoctl.c @@ -26,7 +26,7 @@ CMD_FUNC(m_protoctl); #define MSG_PROTOCTL "PROTOCTL" -ModuleHeader MOD_HEADER(protoctl) +ModuleHeader MOD_HEADER = { "protoctl", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(protoctl) "unrealircd-5", }; -MOD_INIT(protoctl) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(protoctl) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(protoctl) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/quit.c b/src/modules/quit.c index 63c84869c..6a15edbe4 100644 --- a/src/modules/quit.c +++ b/src/modules/quit.c @@ -24,7 +24,7 @@ CMD_FUNC(m_quit); #define MSG_QUIT "QUIT" /* QUIT */ -ModuleHeader MOD_HEADER(quit) +ModuleHeader MOD_HEADER = { "quit", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(quit) }; /* This is called on module init, before Server Ready */ -MOD_INIT(quit) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,13 +42,13 @@ MOD_INIT(quit) } /* Is first run when server is 100% ready */ -MOD_LOAD(quit) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(quit) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/reputation.c b/src/modules/reputation.c index 98dbdc8aa..e46e85e20 100644 --- a/src/modules/reputation.c +++ b/src/modules/reputation.c @@ -55,7 +55,7 @@ #define CALLBACKTYPE_REPUTATION_STARTTIME 5 #endif -ModuleHeader MOD_HEADER(reputation) +ModuleHeader MOD_HEADER = { "reputation", REPUTATION_VERSION, @@ -129,7 +129,7 @@ void load_db(void); void save_db(void); int reputation_starttime_callback(void); -MOD_TEST(reputation) +MOD_TEST() { memcpy(&ModInf, modinfo, modinfo->size); memset(&cfg, 0, sizeof(cfg)); @@ -139,7 +139,7 @@ MOD_TEST(reputation) return MOD_SUCCESS; } -MOD_INIT(reputation) +MOD_INIT() { ModDataInfo mreq; @@ -170,7 +170,7 @@ MOD_INIT(reputation) return MOD_SUCCESS; } -MOD_LOAD(reputation) +MOD_LOAD() { load_db(); if (reputation_starttime == 0) @@ -181,7 +181,7 @@ MOD_LOAD(reputation) return MOD_SUCCESS; } -MOD_UNLOAD(reputation) +MOD_UNLOAD() { save_db(); return MOD_SUCCESS; diff --git a/src/modules/require-module.c b/src/modules/require-module.c index a38a138e8..1021b7030 100644 --- a/src/modules/require-module.c +++ b/src/modules/require-module.c @@ -22,7 +22,7 @@ #define MSG_SMOD "SMOD" -ModuleHeader MOD_HEADER(require_module) = { +ModuleHeader MOD_HEADER = { "require-module", "5.0", "Check for required modules across the network", @@ -67,13 +67,13 @@ struct cfgstruct { }; static struct cfgstruct cfg; -MOD_TEST(require_module) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, reqmods_configtest); return MOD_SUCCESS; } -MOD_INIT(require_module) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); MARK_AS_GLOBAL_MODULE(modinfo); @@ -85,17 +85,17 @@ MOD_INIT(require_module) return MOD_SUCCESS; } -MOD_LOAD(require_module) +MOD_LOAD() { if (ModuleGetError(modinfo->handle) != MODERR_NOERROR) { - config_error("A critical error occurred when loading module %s: %s", MOD_HEADER(require_module).name, ModuleGetErrorStr(modinfo->handle)); + config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle)); return MOD_FAILED; } return MOD_SUCCESS; } -MOD_UNLOAD(require_module) +MOD_UNLOAD() { DenyMod *dmod, *next; for (dmod = DenyModList; dmod; dmod = next) diff --git a/src/modules/restrict-commands.c b/src/modules/restrict-commands.c index 4de8c8c19..c212e9494 100644 --- a/src/modules/restrict-commands.c +++ b/src/modules/restrict-commands.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(restrict-commands) = { +ModuleHeader MOD_HEADER = { "restrict-commands", "1.0", "Restrict specific commands unless certain conditions have been met", @@ -68,14 +68,14 @@ CmdMap conf_cmdmaps[] = { { NULL, NULL, }, // REQUIRED for the loop to properly work }; -MOD_TEST(restrict-commands) +MOD_TEST() { memcpy(&ModInf, modinfo, modinfo->size); HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, rcmd_configtest); return MOD_SUCCESS; } -MOD_INIT(restrict-commands) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, rcmd_configrun); @@ -86,17 +86,17 @@ MOD_INIT(restrict-commands) return MOD_SUCCESS; } -MOD_LOAD(restrict-commands) +MOD_LOAD() { if (ModuleGetError(modinfo->handle) != MODERR_NOERROR) { - config_error("A critical error occurred when loading module %s: %s", MOD_HEADER(restrict-commands).name, ModuleGetErrorStr(modinfo->handle)); + config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle)); return MOD_FAILED; } return MOD_SUCCESS; } -MOD_UNLOAD(restrict-commands) +MOD_UNLOAD() { RestrictedCommand *rcmd, *next; for (rcmd = RestrictedCommandList; rcmd; rcmd = next) diff --git a/src/modules/rmtkl.c b/src/modules/rmtkl.c index f908b72ad..435be0a35 100644 --- a/src/modules/rmtkl.c +++ b/src/modules/rmtkl.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(rmtkl) = { +ModuleHeader MOD_HEADER = { "rmtkl", "1.4", "Adds /rmtkl command to easily remove *-Lines in bulk", @@ -77,7 +77,7 @@ static char *rmtkl_help[] = { NULL }; -MOD_INIT(rmtkl) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); if (CommandExists("RMTKL")) @@ -89,17 +89,17 @@ MOD_INIT(rmtkl) return MOD_SUCCESS; } -MOD_LOAD(rmtkl) +MOD_LOAD() { if (ModuleGetError(modinfo->handle) != MODERR_NOERROR) { - config_error("A critical error occurred when loading module %s: %s", MOD_HEADER(rmtkl).name, ModuleGetErrorStr(modinfo->handle)); + config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle)); return MOD_FAILED; } return MOD_SUCCESS; } -MOD_UNLOAD(rmtkl) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/rules.c b/src/modules/rules.c index f0088cd1a..1f482c71c 100644 --- a/src/modules/rules.c +++ b/src/modules/rules.c @@ -26,7 +26,7 @@ CMD_FUNC(m_rules); #define MSG_RULES "RULES" -ModuleHeader MOD_HEADER(rules) +ModuleHeader MOD_HEADER = { "rules", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(rules) "unrealircd-5", }; -MOD_INIT(rules) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_RULES, m_rules, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(rules) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(rules) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sajoin.c b/src/modules/sajoin.c index 1a90c5ea1..cad2b0769 100644 --- a/src/modules/sajoin.c +++ b/src/modules/sajoin.c @@ -26,7 +26,7 @@ CMD_FUNC(m_sajoin); #define MSG_SAJOIN "SAJOIN" -ModuleHeader MOD_HEADER(sajoin) +ModuleHeader MOD_HEADER = { "sajoin", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(sajoin) "unrealircd-5", }; -MOD_INIT(sajoin) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SAJOIN, m_sajoin, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(sajoin) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sajoin) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/samode.c b/src/modules/samode.c index 6461fe21e..900a92c89 100644 --- a/src/modules/samode.c +++ b/src/modules/samode.c @@ -26,7 +26,7 @@ CMD_FUNC(m_samode); #define MSG_SAMODE "SAMODE" -ModuleHeader MOD_HEADER(samode) +ModuleHeader MOD_HEADER = { "samode", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(samode) "unrealircd-5", }; -MOD_INIT(samode) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SAMODE, m_samode, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(samode) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(samode) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sapart.c b/src/modules/sapart.c index 88b89a53e..f58396b22 100644 --- a/src/modules/sapart.c +++ b/src/modules/sapart.c @@ -26,7 +26,7 @@ CMD_FUNC(m_sapart); #define MSG_SAPART "SAPART" -ModuleHeader MOD_HEADER(sapart) +ModuleHeader MOD_HEADER = { "sapart", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(sapart) "unrealircd-5", }; -MOD_INIT(sapart) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SAPART, m_sapart, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(sapart) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sapart) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sasl.c b/src/modules/sasl.c index f039d19db..0a53931e4 100644 --- a/src/modules/sasl.c +++ b/src/modules/sasl.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(sasl) +ModuleHeader MOD_HEADER = { "sasl", "5.0", @@ -399,7 +399,7 @@ int sasl_server_synched(Client *sptr) return 0; } -MOD_INIT(sasl) +MOD_INIT() { ClientCapabilityInfo cap; ModDataInfo mreq; @@ -433,13 +433,13 @@ MOD_INIT(sasl) return MOD_SUCCESS; } -MOD_LOAD(sasl) +MOD_LOAD() { auto_discover_sasl_server(0); return MOD_SUCCESS; } -MOD_UNLOAD(sasl) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sdesc.c b/src/modules/sdesc.c index c17592ec1..413aeb487 100644 --- a/src/modules/sdesc.c +++ b/src/modules/sdesc.c @@ -26,7 +26,7 @@ CMD_FUNC(m_sdesc); #define MSG_SDESC "SDESC" /* sdesc */ -ModuleHeader MOD_HEADER(sdesc) +ModuleHeader MOD_HEADER = { "sdesc", /* Name of module */ "5.0", /* Version */ @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(sdesc) "unrealircd-5", }; -MOD_INIT(sdesc) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SDESC, m_sdesc, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(sdesc) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sdesc) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sendsno.c b/src/modules/sendsno.c index 3b4452b4e..9c5e84058 100644 --- a/src/modules/sendsno.c +++ b/src/modules/sendsno.c @@ -24,7 +24,7 @@ CMD_FUNC(m_sendsno); #define MSG_SENDSNO "SENDSNO" -ModuleHeader MOD_HEADER(sendsno) +ModuleHeader MOD_HEADER = { "sendsno", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(sendsno) }; /* This is called on module init, before Server Ready */ -MOD_INIT(sendsno) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SENDSNO, m_sendsno, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,13 +42,13 @@ MOD_INIT(sendsno) } /* Is first run when server is 100% ready */ -MOD_LOAD(sendsno) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(sendsno) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sendumode.c b/src/modules/sendumode.c index 31e172f5e..82bf6d793 100644 --- a/src/modules/sendumode.c +++ b/src/modules/sendumode.c @@ -26,7 +26,7 @@ CMD_FUNC(m_sendumode); #define MSG_SENDUMODE "SENDUMODE" #define MSG_SMO "SMO" -ModuleHeader MOD_HEADER(sendumode) +ModuleHeader MOD_HEADER = { "sendumode", /* Name of module */ "5.0", /* Version */ @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(sendumode) }; /* This is called on module init, before Server Ready */ -MOD_INIT(sendumode) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SENDUMODE, m_sendumode, MAXPARA, M_SERVER); CommandAdd(modinfo->handle, MSG_SMO, m_sendumode, MAXPARA, M_SERVER); @@ -45,13 +45,13 @@ MOD_INIT(sendumode) } /* Is first run when server is 100% ready */ -MOD_LOAD(sendumode) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(sendumode) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/server-time.c b/src/modules/server-time.c index a4073bd6a..40d0fcbf1 100644 --- a/src/modules/server-time.c +++ b/src/modules/server-time.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(server-time) +ModuleHeader MOD_HEADER = { "server-time", "5.0", @@ -37,7 +37,7 @@ long CAP_SERVER_TIME = 0L; int server_time_mtag_is_ok(Client *acptr, char *name, char *value); void mtag_add_or_inherit_time(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature); -MOD_INIT(server-time) +MOD_INIT() { ClientCapabilityInfo cap; ClientCapability *c; @@ -60,12 +60,12 @@ MOD_INIT(server-time) return MOD_SUCCESS; } -MOD_LOAD(server-time) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(server-time) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/server.c b/src/modules/server.c index c2cccf581..5f50cf7a5 100644 --- a/src/modules/server.c +++ b/src/modules/server.c @@ -40,7 +40,7 @@ static char buf[BUFSIZE]; #define MSG_SERVER "SERVER" -ModuleHeader MOD_HEADER(server) +ModuleHeader MOD_HEADER = { "server", "5.0", @@ -49,7 +49,7 @@ ModuleHeader MOD_HEADER(server) "unrealircd-5", }; -MOD_TEST(server) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); EfunctionAddVoid(modinfo->handle, EFUNC_SEND_PROTOCTL_SERVERS, _send_protoctl_servers); @@ -61,7 +61,7 @@ MOD_TEST(server) return MOD_SUCCESS; } -MOD_INIT(server) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER); CommandAdd(modinfo->handle, "SID", m_server_remote, MAXPARA, M_SERVER); @@ -71,12 +71,12 @@ MOD_INIT(server) return MOD_SUCCESS; } -MOD_LOAD(server) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(server) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sethost.c b/src/modules/sethost.c index 31bde2dca..cc04a6f80 100644 --- a/src/modules/sethost.c +++ b/src/modules/sethost.c @@ -27,7 +27,7 @@ CMD_FUNC(m_sethost); /* Place includes here */ #define MSG_SETHOST "SETHOST" /* sethost */ -ModuleHeader MOD_HEADER(sethost) +ModuleHeader MOD_HEADER = { "sethost", /* Name of module */ "5.0", /* Version */ @@ -36,19 +36,19 @@ ModuleHeader MOD_HEADER(sethost) "unrealircd-5", }; -MOD_INIT(sethost) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SETHOST, m_sethost, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(sethost) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sethost) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/setident.c b/src/modules/setident.c index 2b3857979..94d90d238 100644 --- a/src/modules/setident.c +++ b/src/modules/setident.c @@ -26,7 +26,7 @@ CMD_FUNC(m_setident); -ModuleHeader MOD_HEADER(setident) +ModuleHeader MOD_HEADER = { "setident", /* Name of module */ "5.0", /* Version */ @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(setident) "unrealircd-5", }; -MOD_INIT(setident) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SETIDENT, m_setident, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(setident) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(setident) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/setname.c b/src/modules/setname.c index 34377969d..9789c6b51 100644 --- a/src/modules/setname.c +++ b/src/modules/setname.c @@ -26,7 +26,7 @@ CMD_FUNC(m_setname); #define MSG_SETNAME "SETNAME" /* setname */ -ModuleHeader MOD_HEADER(setname) +ModuleHeader MOD_HEADER = { "setname", /* Name of module */ "5.0", /* Version */ @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(setname) "unrealircd-5", }; -MOD_INIT(setname) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SETNAME, m_setname, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(setname) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(setname) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/silence.c b/src/modules/silence.c index 78801d413..389b57070 100644 --- a/src/modules/silence.c +++ b/src/modules/silence.c @@ -26,7 +26,7 @@ CMD_FUNC(m_silence); #define MSG_SILENCE "SILENCE" -ModuleHeader MOD_HEADER(silence) +ModuleHeader MOD_HEADER = { "silence", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(silence) "unrealircd-5", }; -MOD_INIT(silence) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SILENCE, m_silence, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(silence) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(silence) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sinfo.c b/src/modules/sinfo.c index aa2ba4959..85977dc5b 100644 --- a/src/modules/sinfo.c +++ b/src/modules/sinfo.c @@ -6,7 +6,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(sinfo) +ModuleHeader MOD_HEADER = { "sinfo", "5.0", @@ -18,7 +18,7 @@ ModuleHeader MOD_HEADER(sinfo) /* Forward declarations */ CMD_FUNC(m_sinfo); -MOD_INIT(sinfo) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); CommandAdd(modinfo->handle, "SINFO", m_sinfo, MAXPARA, M_USER|M_SERVER); @@ -26,12 +26,12 @@ MOD_INIT(sinfo) return MOD_SUCCESS; } -MOD_LOAD(sinfo) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sinfo) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sjoin.c b/src/modules/sjoin.c index 425965c3c..68a4322ce 100644 --- a/src/modules/sjoin.c +++ b/src/modules/sjoin.c @@ -26,7 +26,7 @@ CMD_FUNC(m_sjoin); #define MSG_SJOIN "SJOIN" -ModuleHeader MOD_HEADER(sjoin) +ModuleHeader MOD_HEADER = { "sjoin", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(sjoin) "unrealircd-5", }; -MOD_INIT(sjoin) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SJOIN, m_sjoin, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(sjoin) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(sjoin) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/snomasks/dccreject.c b/src/modules/snomasks/dccreject.c index f8fb03dbd..4006837d4 100644 --- a/src/modules/snomasks/dccreject.c +++ b/src/modules/snomasks/dccreject.c @@ -20,7 +20,7 @@ #include "unrealircd.h" /* Module header */ -ModuleHeader MOD_HEADER(dccreject) +ModuleHeader MOD_HEADER = { "snomasks/dccreject", "4.2", @@ -35,12 +35,12 @@ long SNO_DCCREJECT = 0L; /* Forward declarations */ int dccreject_dcc_denied(Client *sptr, Client *target, char *realfile, char *displayfile, ConfigItem_deny_dcc *dccdeny); -MOD_TEST(dccreject) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(dccreject) +MOD_INIT() { SnomaskAdd(modinfo->handle, 'D', umode_allow_opers, &SNO_DCCREJECT); @@ -50,12 +50,12 @@ MOD_INIT(dccreject) return MOD_SUCCESS; } -MOD_LOAD(dccreject) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(dccreject) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sqline.c b/src/modules/sqline.c index 6c17a715b..b41f5ce4d 100644 --- a/src/modules/sqline.c +++ b/src/modules/sqline.c @@ -27,7 +27,7 @@ CMD_FUNC(m_sqline); -ModuleHeader MOD_HEADER(sqline) +ModuleHeader MOD_HEADER = { "sqline", /* Name of module */ "5.0", /* Version */ @@ -37,7 +37,7 @@ ModuleHeader MOD_HEADER(sqline) }; /* This is called on module init, before Server Ready */ -MOD_INIT(sqline) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SQLINE, m_sqline, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -45,14 +45,14 @@ MOD_INIT(sqline) } /* Is first run when server is 100% ready */ -MOD_LOAD(sqline) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(sqline) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/squit.c b/src/modules/squit.c index a5b8bf837..9b0fb4b1c 100644 --- a/src/modules/squit.c +++ b/src/modules/squit.c @@ -26,7 +26,7 @@ CMD_FUNC(m_squit); #define MSG_SQUIT "SQUIT" -ModuleHeader MOD_HEADER(squit) +ModuleHeader MOD_HEADER = { "squit", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(squit) "unrealircd-5", }; -MOD_INIT(squit) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SQUIT, m_squit, 2, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(squit) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(squit) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/staff.c b/src/modules/staff.c index e9db6b08b..e463e5fbf 100644 --- a/src/modules/staff.c +++ b/src/modules/staff.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(staff) +ModuleHeader MOD_HEADER = { "staff", "3.8", @@ -76,13 +76,13 @@ struct { } Download; #endif -MOD_TEST(staff) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cb_test); return MOD_SUCCESS; } -MOD_INIT(staff) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); #ifdef USE_LIBCURL @@ -101,12 +101,12 @@ MOD_INIT(staff) return MOD_SUCCESS; } -MOD_LOAD(staff) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(staff) +MOD_UNLOAD() { FreeConf(); unload_motd_file(&staff); diff --git a/src/modules/starttls.c b/src/modules/starttls.c index cbe2eb4c5..d7a2991c9 100644 --- a/src/modules/starttls.c +++ b/src/modules/starttls.c @@ -26,7 +26,7 @@ CMD_FUNC(m_starttls); #define MSG_STARTTLS "STARTTLS" -ModuleHeader MOD_HEADER(starttls) +ModuleHeader MOD_HEADER = { "starttls", "5.0", @@ -37,7 +37,7 @@ ModuleHeader MOD_HEADER(starttls) long CLICAP_STARTTLS; -MOD_INIT(starttls) +MOD_INIT() { ClientCapabilityInfo cap; @@ -50,12 +50,12 @@ MOD_INIT(starttls) return MOD_SUCCESS; } -MOD_LOAD(starttls) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(starttls) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/stats.c b/src/modules/stats.c index 10d7bb2e0..a4c3ba0dc 100644 --- a/src/modules/stats.c +++ b/src/modules/stats.c @@ -26,7 +26,7 @@ CMD_FUNC(m_stats); #define MSG_STATS "STATS" -ModuleHeader MOD_HEADER(stats) +ModuleHeader MOD_HEADER = { "stats", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(stats) "unrealircd-5", }; -MOD_INIT(stats) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_STATS, m_stats, 3, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(stats) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(stats) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/sts.c b/src/modules/sts.c index 1a8cab2b1..254ef15c9 100644 --- a/src/modules/sts.c +++ b/src/modules/sts.c @@ -22,7 +22,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(sts) +ModuleHeader MOD_HEADER = { "sts", "5.0", @@ -31,7 +31,7 @@ ModuleHeader MOD_HEADER(sts) "unrealircd-5", }; -MOD_INIT(sts) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -40,14 +40,14 @@ MOD_INIT(sts) void init_sts(ModuleInfo *modinfo); -MOD_LOAD(sts) +MOD_LOAD() { /* init_sts is delayed to MOD_LOAD due to configuration dependency */ init_sts(modinfo); return MOD_SUCCESS; } -MOD_UNLOAD(sts) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsfline.c b/src/modules/svsfline.c index 544edb5bc..4091c07a3 100644 --- a/src/modules/svsfline.c +++ b/src/modules/svsfline.c @@ -26,7 +26,7 @@ CMD_FUNC(m_svsfline); #define MSG_SVSFLINE "SVSFLINE" -ModuleHeader MOD_HEADER(svsfline) +ModuleHeader MOD_HEADER = { "svsfline", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(svsfline) "unrealircd-5", }; -MOD_INIT(svsfline) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSFLINE, m_svsfline, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(svsfline) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsfline) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsjoin.c b/src/modules/svsjoin.c index 1d0d954ce..d5089f7c2 100644 --- a/src/modules/svsjoin.c +++ b/src/modules/svsjoin.c @@ -24,7 +24,7 @@ CMD_FUNC(m_svsjoin); /* Place includes here */ #define MSG_SVSJOIN "SVSJOIN" -ModuleHeader MOD_HEADER(svsjoin) +ModuleHeader MOD_HEADER = { "svsjoin", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(svsjoin) }; /* This is called on module init, before Server Ready */ -MOD_INIT(svsjoin) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSJOIN, m_svsjoin, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,13 +42,13 @@ MOD_INIT(svsjoin) } /* Is first run when server is 100% ready */ -MOD_LOAD(svsjoin) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svsjoin) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svskill.c b/src/modules/svskill.c index 990118a68..be734864f 100644 --- a/src/modules/svskill.c +++ b/src/modules/svskill.c @@ -23,7 +23,7 @@ CMD_FUNC(m_svskill); #define MSG_SVSKILL "SVSKILL" -ModuleHeader MOD_HEADER(svskill) +ModuleHeader MOD_HEADER = { "svskill", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(svskill) /* This is called on module init, before Server Ready */ -MOD_INIT(svskill) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSKILL, m_svskill, MAXPARA, M_SERVER|M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,14 +42,14 @@ MOD_INIT(svskill) } /* Is first run when server is 100% ready */ -MOD_LOAD(svskill) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svskill) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svslusers.c b/src/modules/svslusers.c index 1ae6c81f1..9894bb231 100644 --- a/src/modules/svslusers.c +++ b/src/modules/svslusers.c @@ -28,7 +28,7 @@ CMD_FUNC(m_svslusers); #define MSG_SVSLUSERS "SVSLUSERS" -ModuleHeader MOD_HEADER(svslusers) +ModuleHeader MOD_HEADER = { "svslusers", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(svslusers) "unrealircd-5", }; -MOD_INIT(svslusers) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSLUSERS, m_svslusers, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(svslusers) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svslusers) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsmode.c b/src/modules/svsmode.c index 7e6814003..da315d49a 100644 --- a/src/modules/svsmode.c +++ b/src/modules/svsmode.c @@ -33,7 +33,7 @@ CMD_FUNC(m_svs2mode); #define MSG_SVSMODE "SVSMODE" #define MSG_SVS2MODE "SVS2MODE" -ModuleHeader MOD_HEADER(svsmode) +ModuleHeader MOD_HEADER = { "svsmode", "5.0", @@ -42,7 +42,7 @@ ModuleHeader MOD_HEADER(svsmode) "unrealircd-5", }; -MOD_INIT(svsmode) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSMODE, m_svsmode, MAXPARA, M_SERVER|M_USER); CommandAdd(modinfo->handle, MSG_SVS2MODE, m_svs2mode, MAXPARA, M_SERVER|M_USER); @@ -50,12 +50,12 @@ MOD_INIT(svsmode) return MOD_SUCCESS; } -MOD_LOAD(svsmode) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsmode) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsmotd.c b/src/modules/svsmotd.c index 733406d98..a47c616a6 100644 --- a/src/modules/svsmotd.c +++ b/src/modules/svsmotd.c @@ -28,7 +28,7 @@ CMD_FUNC(m_svsmotd); #define MSG_SVSMOTD "SVSMOTD" -ModuleHeader MOD_HEADER(svsmotd) +ModuleHeader MOD_HEADER = { "svsmotd", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(svsmotd) "unrealircd-5", }; -MOD_INIT(svsmotd) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSMOTD, m_svsmotd, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(svsmotd) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsmotd) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsnick.c b/src/modules/svsnick.c index 0d8b0bcb5..d430a8e9b 100644 --- a/src/modules/svsnick.c +++ b/src/modules/svsnick.c @@ -28,7 +28,7 @@ CMD_FUNC(m_svsnick); #define MSG_SVSNICK "SVSNICK" -ModuleHeader MOD_HEADER(svsnick) +ModuleHeader MOD_HEADER = { "svsnick", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(svsnick) "unrealircd-5", }; -MOD_INIT(svsnick) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSNICK, m_svsnick, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(svsnick) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsnick) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsnline.c b/src/modules/svsnline.c index 1571ce053..2f0b03e84 100644 --- a/src/modules/svsnline.c +++ b/src/modules/svsnline.c @@ -28,7 +28,7 @@ CMD_FUNC(m_svsnline); #define MSG_SVSNLINE "SVSNLINE" /* svsnline */ -ModuleHeader MOD_HEADER(svsnline) +ModuleHeader MOD_HEADER = { "svsnline", /* Name of module */ "5.0", /* Version */ @@ -38,7 +38,7 @@ ModuleHeader MOD_HEADER(svsnline) }; /* This is called on module init, before Server Ready */ -MOD_INIT(svsnline) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSNLINE, m_svsnline, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -46,13 +46,13 @@ MOD_INIT(svsnline) } /* Is first run when server is 100% ready */ -MOD_LOAD(svsnline) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svsnline) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsnolag.c b/src/modules/svsnolag.c index fdf7e1e87..56de96e9a 100644 --- a/src/modules/svsnolag.c +++ b/src/modules/svsnolag.c @@ -27,7 +27,7 @@ CMD_FUNC(m_svs2nolag); #define MSG_SVSNOLAG "SVSNOLAG" #define MSG_SVS2NOLAG "SVS2NOLAG" -ModuleHeader MOD_HEADER(svsnolag) +ModuleHeader MOD_HEADER = { "svsnolag", "5.0", @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(svsnolag) "unrealircd-5", }; -MOD_INIT(svsnolag) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSNOLAG, m_svsnolag, MAXPARA, M_SERVER); CommandAdd(modinfo->handle, MSG_SVS2NOLAG, m_svs2nolag, MAXPARA, M_SERVER); @@ -44,12 +44,12 @@ MOD_INIT(svsnolag) return MOD_SUCCESS; } -MOD_LOAD(svsnolag) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsnolag) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svsnoop.c b/src/modules/svsnoop.c index 5367bce59..9c940c4be 100644 --- a/src/modules/svsnoop.c +++ b/src/modules/svsnoop.c @@ -29,7 +29,7 @@ CMD_FUNC(m_svsnoop); #define MSG_SVSNOOP "SVSNOOP" -ModuleHeader MOD_HEADER(svsnoop) +ModuleHeader MOD_HEADER = { "svsnoop", "5.0", @@ -38,19 +38,19 @@ ModuleHeader MOD_HEADER(svsnoop) "unrealircd-5", }; -MOD_INIT(svsnoop) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSNOOP, m_svsnoop, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(svsnoop) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svsnoop) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svspart.c b/src/modules/svspart.c index 22659c10d..d8669c741 100644 --- a/src/modules/svspart.c +++ b/src/modules/svspart.c @@ -23,7 +23,7 @@ CMD_FUNC(m_svspart); #define MSG_SVSPART "SVSPART" -ModuleHeader MOD_HEADER(svspart) +ModuleHeader MOD_HEADER = { "svspart", /* Name of module */ "5.0", /* Version */ @@ -33,7 +33,7 @@ ModuleHeader MOD_HEADER(svspart) }; /* This is called on module init, before Server Ready */ -MOD_INIT(svspart) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSPART, m_svspart, 3, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -41,13 +41,13 @@ MOD_INIT(svspart) } /* Is first run when server is 100% ready */ -MOD_LOAD(svspart) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svspart) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svssilence.c b/src/modules/svssilence.c index b74d72f6a..26f25f323 100644 --- a/src/modules/svssilence.c +++ b/src/modules/svssilence.c @@ -24,7 +24,7 @@ CMD_FUNC(m_svssilence); /* Place includes here */ #define MSG_SVSSILENCE "SVSSILENCE" -ModuleHeader MOD_HEADER(svssilence) +ModuleHeader MOD_HEADER = { "svssilence", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(svssilence) }; /* This is called on module init, before Server Ready */ -MOD_INIT(svssilence) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSSILENCE, m_svssilence, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,13 +42,13 @@ MOD_INIT(svssilence) } /* Is first run when server is 100% ready */ -MOD_LOAD(svssilence) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svssilence) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svssno.c b/src/modules/svssno.c index 6cae3ff52..676589e11 100644 --- a/src/modules/svssno.c +++ b/src/modules/svssno.c @@ -28,7 +28,7 @@ CMD_FUNC(m_svs2sno); #define MSG_SVSSNO "SVSSNO" #define MSG_SVS2SNO "SVS2SNO" -ModuleHeader MOD_HEADER(svssno) +ModuleHeader MOD_HEADER = { "svssno", "5.0", @@ -37,7 +37,7 @@ ModuleHeader MOD_HEADER(svssno) "unrealircd-5", }; -MOD_INIT(svssno) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSSNO, m_svssno, MAXPARA, M_USER|M_SERVER); CommandAdd(modinfo->handle, MSG_SVS2SNO, m_svs2sno, MAXPARA, M_USER|M_SERVER); @@ -45,12 +45,12 @@ MOD_INIT(svssno) return MOD_SUCCESS; } -MOD_LOAD(svssno) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(svssno) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/svswatch.c b/src/modules/svswatch.c index 9c2d5e4b5..81a886115 100644 --- a/src/modules/svswatch.c +++ b/src/modules/svswatch.c @@ -24,7 +24,7 @@ CMD_FUNC(m_svswatch); /* Place includes here */ #define MSG_SVSWATCH "SVSWATCH" -ModuleHeader MOD_HEADER(svswatch) +ModuleHeader MOD_HEADER = { "svswatch", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(svswatch) }; /* This is called on module init, before Server Ready */ -MOD_INIT(svswatch) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SVSWATCH, m_svswatch, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,14 +42,14 @@ MOD_INIT(svswatch) } /* Is first run when server is 100% ready */ -MOD_LOAD(svswatch) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(svswatch) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/swhois.c b/src/modules/swhois.c index 3a99f7a8d..dab6abe1b 100644 --- a/src/modules/swhois.c +++ b/src/modules/swhois.c @@ -28,7 +28,7 @@ CMD_FUNC(m_swhois); #define MSG_SWHOIS "SWHOIS" -ModuleHeader MOD_HEADER(swhois) +ModuleHeader MOD_HEADER = { "swhois", "5.0", @@ -37,19 +37,19 @@ ModuleHeader MOD_HEADER(swhois) "unrealircd-5", }; -MOD_INIT(swhois) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_SWHOIS, m_swhois, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(swhois) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(swhois) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/time.c b/src/modules/time.c index f1734e5dc..a2e4305a8 100644 --- a/src/modules/time.c +++ b/src/modules/time.c @@ -24,7 +24,7 @@ CMD_FUNC(m_time); /* Place includes here */ #define MSG_TIME "TIME" -ModuleHeader MOD_HEADER(time) +ModuleHeader MOD_HEADER = { "time", /* Name of module */ "5.0", /* Version */ @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(time) /* This is called on module init, before Server Ready */ -MOD_INIT(time) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_TIME, m_time, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -43,14 +43,14 @@ MOD_INIT(time) } /* Is first run when server is 100% ready */ -MOD_LOAD(time) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(time) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/tkl.c b/src/modules/tkl.c index 80337eadf..278bed286 100644 --- a/src/modules/tkl.c +++ b/src/modules/tkl.c @@ -23,7 +23,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(tkl) +ModuleHeader MOD_HEADER = { "tkl", "5.0", @@ -132,7 +132,7 @@ TKLTypeTable tkl_types[] = { }; #define ALL_VALID_EXCEPTION_TYPES "kline, gline, zline, gzline, spamfilter, shun, qline, blacklist, connect-flood, unknown-data-flood, antirandom, antimixedutf8, ban-version" -MOD_TEST(tkl) +MOD_TEST() { MARK_AS_OFFICIAL_MODULE(modinfo); HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkl_config_test_spamfilter); @@ -174,7 +174,7 @@ MOD_TEST(tkl) return MOD_SUCCESS; } -MOD_INIT(tkl) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, tkl_config_run_spamfilter); @@ -193,13 +193,13 @@ MOD_INIT(tkl) return MOD_SUCCESS; } -MOD_LOAD(tkl) +MOD_LOAD() { EventAdd(modinfo->handle, "tklexpire", 5, 0, tkl_check_expire, NULL); return MOD_SUCCESS; } -MOD_UNLOAD(tkl) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/tkldb.c b/src/modules/tkldb.c index 5becf4901..81c46dbe8 100644 --- a/src/modules/tkldb.c +++ b/src/modules/tkldb.c @@ -19,7 +19,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(tkldb) = { +ModuleHeader MOD_HEADER = { "tkldb", "1.10", "Stores active TKL entries (*-Lines) persistently/across IRCd restarts", @@ -72,7 +72,7 @@ ModuleHeader MOD_HEADER(tkldb) = { #define IsMDErr(x, y, z) \ do { \ if (!(x)) { \ - config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER(y).name, ModuleGetErrorStr((z)->handle)); \ + config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER.name, ModuleGetErrorStr((z)->handle)); \ return MOD_FAILED; \ } \ } while(0) @@ -97,14 +97,14 @@ static struct cfgstruct cfg; static int tkls_loaded = 0; -MOD_TEST(tkldb) +MOD_TEST() { memset(&cfg, 0, sizeof(cfg)); HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkldb_configtest); return MOD_SUCCESS; } -MOD_INIT(tkldb) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); @@ -132,18 +132,18 @@ MOD_INIT(tkldb) return MOD_SUCCESS; } -MOD_LOAD(tkldb) +MOD_LOAD() { EventAdd(modinfo->handle, "tkldb_write_tkldb", TKL_DB_SAVE_EVERY, 0, write_tkldb_evt, NULL); if (ModuleGetError(modinfo->handle) != MODERR_NOERROR) { - config_error("A critical error occurred when loading module %s: %s", MOD_HEADER(tkldb).name, ModuleGetErrorStr(modinfo->handle)); + config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle)); return MOD_FAILED; } return MOD_SUCCESS; } -MOD_UNLOAD(tkldb) +MOD_UNLOAD() { write_tkldb(); freecfg(); diff --git a/src/modules/tls_antidos.c b/src/modules/tls_antidos.c index 4c444e884..a9bfdfe8f 100644 --- a/src/modules/tls_antidos.c +++ b/src/modules/tls_antidos.c @@ -10,7 +10,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(tls_antidos) +ModuleHeader MOD_HEADER = { "tls_antidos", "5.0", @@ -36,7 +36,7 @@ int tls_antidos_handshake(Client *acptr); void tls_antidos_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp); -MOD_INIT(tls_antidos) +MOD_INIT() { HookAdd(modinfo->handle, HOOKTYPE_HANDSHAKE, 0, tls_antidos_handshake); @@ -52,12 +52,12 @@ MOD_INIT(tls_antidos) return MOD_SUCCESS; } -MOD_LOAD(tls_antidos) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(tls_antidos) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/topic.c b/src/modules/topic.c index 38519bec5..707d3a696 100644 --- a/src/modules/topic.c +++ b/src/modules/topic.c @@ -26,7 +26,7 @@ CMD_FUNC(m_topic); #define MSG_TOPIC "TOPIC" -ModuleHeader MOD_HEADER(topic) +ModuleHeader MOD_HEADER = { "topic", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(topic) "unrealircd-5", }; -MOD_INIT(topic) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_TOPIC, m_topic, 4, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(topic) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(topic) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/trace.c b/src/modules/trace.c index 93b9b1c1d..1be09b380 100644 --- a/src/modules/trace.c +++ b/src/modules/trace.c @@ -26,7 +26,7 @@ CMD_FUNC(m_trace); #define MSG_TRACE "TRACE" -ModuleHeader MOD_HEADER(trace) +ModuleHeader MOD_HEADER = { "trace", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(trace) "unrealircd-5", }; -MOD_INIT(trace) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_TRACE, m_trace, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(trace) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(trace) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/tsctl.c b/src/modules/tsctl.c index 8c6fb2f58..44f1e25ff 100644 --- a/src/modules/tsctl.c +++ b/src/modules/tsctl.c @@ -20,7 +20,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(tsctl) +ModuleHeader MOD_HEADER = { "tsctl", /* Name of module */ "5.0", /* Version */ @@ -31,19 +31,19 @@ ModuleHeader MOD_HEADER(tsctl) CMD_FUNC(m_tsctl); -MOD_INIT(tsctl) +MOD_INIT() { CommandAdd(modinfo->handle, "TSCTL", m_tsctl, MAXPARA, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(tsctl) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(tsctl) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/umode2.c b/src/modules/umode2.c index 868c0dd97..7828f80f7 100644 --- a/src/modules/umode2.c +++ b/src/modules/umode2.c @@ -26,7 +26,7 @@ CMD_FUNC(m_umode2); #define MSG_UMODE2 "UMODE2" -ModuleHeader MOD_HEADER(umode2) +ModuleHeader MOD_HEADER = { "umode2", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(umode2) "unrealircd-5", }; -MOD_INIT(umode2) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_UMODE2, m_umode2, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(umode2) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(umode2) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/undccdeny.c b/src/modules/undccdeny.c index 91a3694b2..ca8b89d16 100644 --- a/src/modules/undccdeny.c +++ b/src/modules/undccdeny.c @@ -26,7 +26,7 @@ CMD_FUNC(m_undccdeny); #define MSG_UNDCCDENY "UNDCCDENY" -ModuleHeader MOD_HEADER(undccdeny) +ModuleHeader MOD_HEADER = { "undccdeny", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(undccdeny) "unrealircd-5", }; -MOD_INIT(undccdeny) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_UNDCCDENY, m_undccdeny, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(undccdeny) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(undccdeny) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/unsqline.c b/src/modules/unsqline.c index 2923ad4f7..a2b1821ff 100644 --- a/src/modules/unsqline.c +++ b/src/modules/unsqline.c @@ -24,7 +24,7 @@ CMD_FUNC(m_unsqline); #define MSG_UNSQLINE "UNSQLINE" /* UNSQLINE */ -ModuleHeader MOD_HEADER(unsqline) +ModuleHeader MOD_HEADER = { "unsqline", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(unsqline) }; /* This is called on module init, before Server Ready */ -MOD_INIT(unsqline) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_UNSQLINE, m_unsqline, MAXPARA, M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,13 +42,13 @@ MOD_INIT(unsqline) } /* Is first run when server is 100% ready */ -MOD_LOAD(unsqline) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(unsqline) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/user.c b/src/modules/user.c index fb1c65c98..fef9a84ad 100644 --- a/src/modules/user.c +++ b/src/modules/user.c @@ -26,7 +26,7 @@ CMD_FUNC(m_user); #define MSG_USER "USER" -ModuleHeader MOD_HEADER(user) +ModuleHeader MOD_HEADER = { "user", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(user) "unrealircd-5", }; -MOD_INIT(user) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_USER, m_user, 4, M_USER|M_UNREGISTERED); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(user) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(user) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/userhost.c b/src/modules/userhost.c index 81f75447a..ba0e2fbf7 100644 --- a/src/modules/userhost.c +++ b/src/modules/userhost.c @@ -26,7 +26,7 @@ CMD_FUNC(m_userhost); #define MSG_USERHOST "USERHOST" -ModuleHeader MOD_HEADER(userhost) +ModuleHeader MOD_HEADER = { "userhost", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(userhost) "unrealircd-5", }; -MOD_INIT(userhost) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_USERHOST, m_userhost, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(userhost) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(userhost) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/userip.c b/src/modules/userip.c index 2d401bde2..b5535177c 100644 --- a/src/modules/userip.c +++ b/src/modules/userip.c @@ -26,7 +26,7 @@ CMD_FUNC(m_userip); #define MSG_USERIP "USERIP" -ModuleHeader MOD_HEADER(userip) +ModuleHeader MOD_HEADER = { "userip", "5.0", @@ -35,7 +35,7 @@ ModuleHeader MOD_HEADER(userip) "unrealircd-5", }; -MOD_INIT(userip) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_USERIP, m_userip, 1, M_USER); ISupportAdd(modinfo->handle, "USERIP", NULL); @@ -43,12 +43,12 @@ MOD_INIT(userip) return MOD_SUCCESS; } -MOD_LOAD(userip) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(userip) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/bot.c b/src/modules/usermodes/bot.c index 183f582f1..26b6d7f66 100644 --- a/src/modules/usermodes/bot.c +++ b/src/modules/usermodes/bot.c @@ -22,7 +22,7 @@ #define IsBot(cptr) (cptr->umodes & UMODE_BOT) /* Module header */ -ModuleHeader MOD_HEADER(bot) +ModuleHeader MOD_HEADER = { "usermodes/bot", "4.2", @@ -39,12 +39,12 @@ int bot_whois(Client *sptr, Client *acptr); int bot_who_status(Client *sptr, Client *acptr, Channel *chptr, Member *cm, char *status, int cansee); int bot_umode_change(Client *sptr, long oldmode, long newmode); -MOD_TEST(bot) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(bot) +MOD_INIT() { UmodeAdd(modinfo->handle, 'B', UMODE_GLOBAL, 0, NULL, &UMODE_BOT); @@ -56,12 +56,12 @@ MOD_INIT(bot) return MOD_SUCCESS; } -MOD_LOAD(bot) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(bot) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/censor.c b/src/modules/usermodes/censor.c index 4abc15660..592c52614 100644 --- a/src/modules/usermodes/censor.c +++ b/src/modules/usermodes/censor.c @@ -6,7 +6,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(censor) +ModuleHeader MOD_HEADER = { "usermodes/censor", "4.2", @@ -32,13 +32,13 @@ ConfigItem_badword *conf_badword_message = NULL; static ConfigItem_badword *copy_badword_struct(ConfigItem_badword *ca, int regex, int regflags); -MOD_TEST(censor) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, censor_config_test); return MOD_SUCCESS; } -MOD_INIT(censor) +MOD_INIT() { ModInfo = modinfo; @@ -52,13 +52,13 @@ MOD_INIT(censor) return MOD_SUCCESS; } -MOD_LOAD(censor) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(censor) +MOD_UNLOAD() { ConfigItem_badword *badword, *next; diff --git a/src/modules/usermodes/noctcp.c b/src/modules/usermodes/noctcp.c index 199d9104f..828ade12e 100644 --- a/src/modules/usermodes/noctcp.c +++ b/src/modules/usermodes/noctcp.c @@ -21,7 +21,7 @@ CMD_FUNC(noctcp); -ModuleHeader MOD_HEADER(noctcp) +ModuleHeader MOD_HEADER = { "usermodes/noctcp", "4.2", @@ -36,12 +36,12 @@ long UMODE_NOCTCP = 0L; char *noctcp_preusermsg(Client *sptr, Client *acptr, char *text, int notice); -MOD_TEST(noctcp) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(noctcp) +MOD_INIT() { CmodeInfo req; @@ -53,12 +53,12 @@ CmodeInfo req; return MOD_SUCCESS; } -MOD_LOAD(noctcp) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(noctcp) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/nokick.c b/src/modules/usermodes/nokick.c index e261da4b2..40fd4ab8f 100644 --- a/src/modules/usermodes/nokick.c +++ b/src/modules/usermodes/nokick.c @@ -22,7 +22,7 @@ #define IsNokick(cptr) (cptr->umodes & UMODE_NOKICK) /* Module header */ -ModuleHeader MOD_HEADER(nokick) +ModuleHeader MOD_HEADER = { "usermodes/nokick", "4.2", @@ -38,12 +38,12 @@ long UMODE_NOKICK = 0L; int nokick_can_kick(Client *sptr, Client *target, Channel *chptr, char *comment, long sptr_flags, long target_flags, char **reject_reason); -MOD_TEST(nokick) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(nokick) +MOD_INIT() { UmodeAdd(modinfo->handle, 'q', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_NOKICK); // TODO: limit more!! @@ -53,12 +53,12 @@ MOD_INIT(nokick) return MOD_SUCCESS; } -MOD_LOAD(nokick) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(nokick) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/privacy.c b/src/modules/usermodes/privacy.c index 28730eb38..c3b9f4f02 100644 --- a/src/modules/usermodes/privacy.c +++ b/src/modules/usermodes/privacy.c @@ -22,7 +22,7 @@ #define IsPrivacy(cptr) (cptr->umodes & UMODE_PRIVACY) /* Module header */ -ModuleHeader MOD_HEADER(privacy) +ModuleHeader MOD_HEADER = { "usermodes/privacy", "4.2", @@ -37,7 +37,7 @@ long UMODE_PRIVACY = 0L; /* Forward declarations */ int privacy_see_channel_in_whois(Client *sptr, Client *target, Channel *chptr); -MOD_INIT(privacy) +MOD_INIT() { UmodeAdd(modinfo->handle, 'p', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_PRIVACY); @@ -47,12 +47,12 @@ MOD_INIT(privacy) return MOD_SUCCESS; } -MOD_LOAD(privacy) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(privacy) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/privdeaf.c b/src/modules/usermodes/privdeaf.c index 521c5134e..1b71c1095 100644 --- a/src/modules/usermodes/privdeaf.c +++ b/src/modules/usermodes/privdeaf.c @@ -5,7 +5,7 @@ #include "unrealircd.h" -ModuleHeader MOD_HEADER(privdeaf) +ModuleHeader MOD_HEADER = { "usermodes/privdeaf", "1.2", @@ -19,7 +19,7 @@ static Umode *UmodePrivdeaf = NULL; char *privdeaf_checkmsg(Client *, Client *, char *, int); -MOD_INIT(privdeaf) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); UmodePrivdeaf = UmodeAdd(modinfo->handle, 'D', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_PRIVDEAF); @@ -37,12 +37,12 @@ MOD_INIT(privdeaf) return MOD_SUCCESS; } -MOD_LOAD(privdeaf) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(privdeaf) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/regonlymsg.c b/src/modules/usermodes/regonlymsg.c index 8f4f3856f..0f063d296 100644 --- a/src/modules/usermodes/regonlymsg.c +++ b/src/modules/usermodes/regonlymsg.c @@ -22,7 +22,7 @@ #define IsRegOnlyMsg(cptr) (cptr->umodes & UMODE_REGONLYMSG) /* Module header */ -ModuleHeader MOD_HEADER(regonlymsg) +ModuleHeader MOD_HEADER = { "usermodes/regonlymsg", "4.2", @@ -37,7 +37,7 @@ long UMODE_REGONLYMSG = 0L; /* Forward declarations */ char *regonlymsg_pre_usermsg(Client *sptr, Client *target, char *text, int notice); -MOD_INIT(regonlymsg) +MOD_INIT() { UmodeAdd(modinfo->handle, 'R', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_REGONLYMSG); @@ -47,12 +47,12 @@ MOD_INIT(regonlymsg) return MOD_SUCCESS; } -MOD_LOAD(regonlymsg) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(regonlymsg) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/secureonlymsg.c b/src/modules/usermodes/secureonlymsg.c index 6e4463f3e..699c0720c 100644 --- a/src/modules/usermodes/secureonlymsg.c +++ b/src/modules/usermodes/secureonlymsg.c @@ -23,7 +23,7 @@ #define IsSecureOnlyMsg(cptr) (cptr->umodes & UMODE_SECUREONLYMSG) /* Module header */ -ModuleHeader MOD_HEADER(secureonlymsg) +ModuleHeader MOD_HEADER = { "usermodes/secureonlymsg", "4.2", @@ -38,7 +38,7 @@ long UMODE_SECUREONLYMSG = 0L; /* Forward declarations */ char *secureonlymsg_pre_usermsg(Client *sptr, Client *target, char *text, int notice); -MOD_INIT(secureonlymsg) +MOD_INIT() { UmodeAdd(modinfo->handle, 'Z', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_SECUREONLYMSG); @@ -48,12 +48,12 @@ MOD_INIT(secureonlymsg) return MOD_SUCCESS; } -MOD_LOAD(secureonlymsg) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(secureonlymsg) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/servicebot.c b/src/modules/usermodes/servicebot.c index b81150584..f325d1848 100644 --- a/src/modules/usermodes/servicebot.c +++ b/src/modules/usermodes/servicebot.c @@ -24,7 +24,7 @@ #define WHOIS_SERVICE_STRING ":%s 313 %s %s :is a Network Service" /* Module header */ -ModuleHeader MOD_HEADER(servicebot) +ModuleHeader MOD_HEADER = { "usermodes/servicebot", "4.2", @@ -45,12 +45,12 @@ int servicebot_pre_kill(Client *sptr, Client *target, char *reason); int servicebot_whois(Client *sptr, Client *acptr); int servicebot_see_channel_in_whois(Client *sptr, Client *target, Channel *chptr); -MOD_TEST(servicebot) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(servicebot) +MOD_INIT() { UmodeAdd(modinfo->handle, 'S', UMODE_GLOBAL, 1, umode_allow_none, &UMODE_SERVICEBOT); @@ -64,12 +64,12 @@ MOD_INIT(servicebot) return MOD_SUCCESS; } -MOD_LOAD(servicebot) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(servicebot) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/usermodes/showwhois.c b/src/modules/usermodes/showwhois.c index de574bab3..acf626b55 100644 --- a/src/modules/usermodes/showwhois.c +++ b/src/modules/usermodes/showwhois.c @@ -22,7 +22,7 @@ #define IsWhois(cptr) (cptr->umodes & UMODE_SHOWWHOIS) /* Module header */ -ModuleHeader MOD_HEADER(showwhois) +ModuleHeader MOD_HEADER = { "usermodes/showwhois", "4.2", @@ -37,12 +37,12 @@ long UMODE_SHOWWHOIS = 0L; /* Forward declarations */ int showwhois_whois(Client *sptr, Client *acptr); -MOD_TEST(showwhois) +MOD_TEST() { return MOD_SUCCESS; } -MOD_INIT(showwhois) +MOD_INIT() { UmodeAdd(modinfo->handle, 'W', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_SHOWWHOIS); @@ -52,12 +52,12 @@ MOD_INIT(showwhois) return MOD_SUCCESS; } -MOD_LOAD(showwhois) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(showwhois) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/vhost.c b/src/modules/vhost.c index d15260dff..3245d3b56 100644 --- a/src/modules/vhost.c +++ b/src/modules/vhost.c @@ -24,7 +24,7 @@ CMD_FUNC(m_vhost); /* Place includes here */ #define MSG_VHOST "VHOST" -ModuleHeader MOD_HEADER(vhost) +ModuleHeader MOD_HEADER = { "vhost", /* Name of module */ "5.0", /* Version */ @@ -34,7 +34,7 @@ ModuleHeader MOD_HEADER(vhost) }; /* This is called on module init, before Server Ready */ -MOD_INIT(vhost) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_VHOST, m_vhost, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -42,14 +42,14 @@ MOD_INIT(vhost) } /* Is first run when server is 100% ready */ -MOD_LOAD(vhost) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(vhost) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/wallops.c b/src/modules/wallops.c index e67c48ddd..8901ad434 100644 --- a/src/modules/wallops.c +++ b/src/modules/wallops.c @@ -26,7 +26,7 @@ CMD_FUNC(m_wallops); #define MSG_WALLOPS "WALLOPS" -ModuleHeader MOD_HEADER(wallops) +ModuleHeader MOD_HEADER = { "wallops", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(wallops) "unrealircd-5", }; -MOD_INIT(wallops) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_WALLOPS, m_wallops, 1, M_USER|M_SERVER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(wallops) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(wallops) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/watch.c b/src/modules/watch.c index 0d961d65d..5e91e77fd 100644 --- a/src/modules/watch.c +++ b/src/modules/watch.c @@ -26,7 +26,7 @@ CMD_FUNC(m_watch); #define MSG_WATCH "WATCH" -ModuleHeader MOD_HEADER(watch) +ModuleHeader MOD_HEADER = { "watch", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(watch) "unrealircd-5", }; -MOD_INIT(watch) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_WATCH, m_watch, 1, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(watch) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(watch) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/webirc.c b/src/modules/webirc.c index 276ae5fcc..518817d80 100644 --- a/src/modules/webirc.c +++ b/src/modules/webirc.c @@ -34,7 +34,7 @@ struct ConfigItem_webirc { }; /* Module header */ -ModuleHeader MOD_HEADER(webirc) +ModuleHeader MOD_HEADER = { "webirc", "5.0", @@ -68,14 +68,14 @@ int webirc_secure_connect(Client *acptr); #define MSG_WEBIRC "WEBIRC" -MOD_TEST(webirc) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, webirc_config_test); return MOD_SUCCESS; } /** Called upon module init */ -MOD_INIT(webirc) +MOD_INIT() { ModDataInfo mreq; @@ -106,13 +106,13 @@ MOD_INIT(webirc) } /** Called upon module load */ -MOD_LOAD(webirc) +MOD_LOAD() { return MOD_SUCCESS; } /** Called upon unload */ -MOD_UNLOAD(webirc) +MOD_UNLOAD() { webirc_free_conf(); return MOD_SUCCESS; diff --git a/src/modules/webredir.c b/src/modules/webredir.c index 96ddbb8b3..73a148439 100644 --- a/src/modules/webredir.c +++ b/src/modules/webredir.c @@ -23,7 +23,7 @@ CMD_FUNC(webredir); -ModuleHeader MOD_HEADER(webredir) +ModuleHeader MOD_HEADER = { "webredir", "1.0", @@ -44,14 +44,14 @@ int webredir_config_posttest(int *errs); int webredir_config_test(ConfigFile *, ConfigEntry *, int, int *); int webredir_config_run(ConfigFile *, ConfigEntry *, int); -MOD_TEST(webredir) +MOD_TEST() { HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, webredir_config_test); HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, webredir_config_posttest); return MOD_SUCCESS; } -MOD_INIT(webredir) +MOD_INIT() { CommandAdd(modinfo->handle, "HEAD", webredir, MAXPARA, M_UNREGISTERED); CommandAdd(modinfo->handle, "GET", webredir, MAXPARA, M_UNREGISTERED); @@ -63,7 +63,7 @@ MOD_INIT(webredir) return MOD_SUCCESS; } -MOD_LOAD(webredir) +MOD_LOAD() { if (SHOWCONNECTINFO) { @@ -74,7 +74,7 @@ MOD_LOAD(webredir) return MOD_SUCCESS; } -MOD_UNLOAD(webredir) +MOD_UNLOAD() { free_config(); return MOD_SUCCESS; diff --git a/src/modules/websocket.c b/src/modules/websocket.c index 449326c06..f22ada6ea 100644 --- a/src/modules/websocket.c +++ b/src/modules/websocket.c @@ -10,7 +10,7 @@ #define WEBSOCKET_VERSION "1.0.0" -ModuleHeader MOD_HEADER(websocket) +ModuleHeader MOD_HEADER = { "websocket", WEBSOCKET_VERSION, @@ -58,7 +58,7 @@ int websocket_send_frame(Client *sptr, int opcode, char *buf, int len); /* Global variables */ ModDataInfo *websocket_md; -MOD_INIT(websocket) +MOD_INIT() { ModDataInfo mreq; @@ -79,7 +79,7 @@ MOD_INIT(websocket) return MOD_SUCCESS; } -MOD_LOAD(websocket) +MOD_LOAD() { if (SHOWCONNECTINFO) { @@ -91,7 +91,7 @@ MOD_LOAD(websocket) return MOD_SUCCESS; } -MOD_UNLOAD(websocket) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/who_old.c b/src/modules/who_old.c index 4c59d000e..6c23a0c07 100644 --- a/src/modules/who_old.c +++ b/src/modules/who_old.c @@ -30,7 +30,7 @@ CMD_FUNC(m_who); /* Place includes here */ #define MSG_WHO "WHO" -ModuleHeader MOD_HEADER(who_old) +ModuleHeader MOD_HEADER = { "who_old", /* Name of module */ "5.0", /* Version */ @@ -40,7 +40,7 @@ ModuleHeader MOD_HEADER(who_old) }; /* This is called on module init, before Server Ready */ -MOD_INIT(who_old) +MOD_INIT() { if (!CommandAdd(modinfo->handle, MSG_WHO, m_who, MAXPARA, M_USER)) { @@ -52,14 +52,14 @@ MOD_INIT(who_old) } /* Is first run when server is 100% ready */ -MOD_LOAD(who_old) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(who_old) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/whois.c b/src/modules/whois.c index 198cef290..aef820390 100644 --- a/src/modules/whois.c +++ b/src/modules/whois.c @@ -26,7 +26,7 @@ CMD_FUNC(m_whois); #define MSG_WHOIS "WHOIS" -ModuleHeader MOD_HEADER(whois) +ModuleHeader MOD_HEADER = { "whois", /* Name of module */ "5.0", /* Version */ @@ -36,7 +36,7 @@ ModuleHeader MOD_HEADER(whois) }; /* This is called on module init, before Server Ready */ -MOD_INIT(whois) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_WHOIS, m_whois, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); @@ -44,13 +44,13 @@ MOD_INIT(whois) } /* Is first run when server is 100% ready */ -MOD_LOAD(whois) +MOD_LOAD() { return MOD_SUCCESS; } /* Called when module is unloaded */ -MOD_UNLOAD(whois) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/whowas.c b/src/modules/whowas.c index b74a613d9..e7a0a4ac8 100644 --- a/src/modules/whowas.c +++ b/src/modules/whowas.c @@ -26,7 +26,7 @@ CMD_FUNC(m_whowas); #define MSG_WHOWAS "WHOWAS" -ModuleHeader MOD_HEADER(whowas) +ModuleHeader MOD_HEADER = { "whowas", "5.0", @@ -35,19 +35,19 @@ ModuleHeader MOD_HEADER(whowas) "unrealircd-5", }; -MOD_INIT(whowas) +MOD_INIT() { CommandAdd(modinfo->handle, MSG_WHOWAS, m_whowas, MAXPARA, M_USER); MARK_AS_OFFICIAL_MODULE(modinfo); return MOD_SUCCESS; } -MOD_LOAD(whowas) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(whowas) +MOD_UNLOAD() { return MOD_SUCCESS; } diff --git a/src/modules/whox.c b/src/modules/whox.c index 2bbc3ec21..027e3ea37 100644 --- a/src/modules/whox.c +++ b/src/modules/whox.c @@ -68,7 +68,7 @@ static void do_who_on_channel(Client *sptr, Channel *chptr, int member, int operspy, struct who_format *fmt); static int convert_classical_who_request(Client *sptr, int *parc, char *parv[], char **orig_mask, struct who_format *fmt); -ModuleHeader MOD_HEADER(whox) +ModuleHeader MOD_HEADER = { "whox", "5.0", @@ -77,7 +77,7 @@ ModuleHeader MOD_HEADER(whox) "unrealircd-5", }; -MOD_INIT(whox) +MOD_INIT() { MARK_AS_OFFICIAL_MODULE(modinfo); if (!CommandAdd(modinfo->handle, MSG_WHO, m_whox, MAXPARA, M_USER)) @@ -89,12 +89,12 @@ MOD_INIT(whox) return MOD_SUCCESS; } -MOD_LOAD(whox) +MOD_LOAD() { return MOD_SUCCESS; } -MOD_UNLOAD(whox) +MOD_UNLOAD() { return MOD_SUCCESS; }