]> jfr.im git - irc/atheme/atheme-contrib-modules.git/commitdiff
Move mod_(de)init to the bottom of the files
authorAaron Jones <redacted>
Fri, 2 Mar 2018 21:04:38 +0000 (21:04 +0000)
committerAaron Jones <redacted>
Fri, 2 Mar 2018 22:13:29 +0000 (22:13 +0000)
37 files changed:
cs_access_alias.c
cs_badwords.c
cs_fregister.c
cs_ping.c
cs_updown.c
cs_userinfo.c
gen_vhostonreg.c
gs_roulette.c
ircd_announceserv.c
ircd_catserv.c
mlocktweaker.c
ms_fsend.c
ns_ajoin.c
ns_fenforce.c
ns_forbid.c
ns_fregister.c
ns_generatehash.c
ns_generatepass.c
ns_goodmail.c
ns_listlogins.c
ns_mxcheck.c
ns_mxcheck_async.c
ns_sendpassmail.c
on_db_save.c
os_defcon.c
os_helpme.c
os_joinmon.c
os_kill.c
os_klinechan.c
os_modeall.c
os_pingspam.c
os_procwatch.c
os_savechanmodes.c
os_tabletest.c
os_testcmd.c
os_testproc.c
os_trace.c

index ac2b732f28a6c9775905aebee0b7dfb552924d2c..53403059342e36b9086bf1d4e4d923c7d27980dc 100644 (file)
@@ -13,18 +13,6 @@ static void cs_cmd_access(sourceinfo_t *si, int parc, char *parv[]);
 command_t cs_access = { "ACCESS", "Manipulates channel access lists.",
                          AC_NONE, 4, cs_cmd_access, { .path = "contrib/access" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("chanserv", &cs_access);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("chanserv", &cs_access);
-}
-
 static void
 compat_cmd(sourceinfo_t *si, const char *cmdname, char *channel, char *arg1, char *arg2, char *arg3)
 {
@@ -212,4 +200,16 @@ cs_cmd_access(sourceinfo_t *si, int parc, char *parv[])
                command_fail(si, fault_badparams, _("Invalid command. Use \2/%s%s help\2 for a command listing."), (ircd->uses_rcommand == FALSE) ? "msg " : "", si->service->disp);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("chanserv", &cs_access);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("chanserv", &cs_access);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/cs_access_alias", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_FREENODE)
index ee0f312c055b5f37c8e55df9b54116e8e8e2c4e5..b7043af1b594045b6814b68cc9e6f3a77eb5134a 100644 (file)
@@ -30,43 +30,6 @@ typedef struct badword_ badword_t;
 
 mowgli_patricia_t **cs_set_cmdtree;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       MODULE_TRY_REQUEST_SYMBOL(m, cs_set_cmdtree, "chanserv/set_core", "cs_set_cmdtree");
-
-       if (!module_find_published("backend/opensex"))
-       {
-               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags = MODTYPE_FAIL;
-               return;
-       }
-
-       hook_add_event("channel_message");
-       hook_add_channel_message(on_channel_message);
-
-       hook_add_db_write(write_badword_db);
-
-       db_register_type_handler("BW", db_h_bw);
-
-       service_named_bind_command("chanserv", &cs_badwords);
-       command_add(&cs_set_blockbadwords, *cs_set_cmdtree);
-       command_add(&cs_set_blockbadwordsops, *cs_set_cmdtree);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_channel_message(on_channel_message);
-       hook_del_db_write(write_badword_db);
-
-       db_unregister_type_handler("BW");
-
-       service_named_unbind_command("chanserv", &cs_badwords);
-       command_delete(&cs_set_blockbadwords, *cs_set_cmdtree);
-       command_delete(&cs_set_blockbadwordsops, *cs_set_cmdtree);
-}
-
 static inline mowgli_list_t *
 badwords_list_of(mychan_t *mc)
 {
@@ -517,4 +480,41 @@ cs_set_cmd_blockbadwordsops(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       MODULE_TRY_REQUEST_SYMBOL(m, cs_set_cmdtree, "chanserv/set_core", "cs_set_cmdtree");
+
+       if (!module_find_published("backend/opensex"))
+       {
+               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
+               m->mflags = MODTYPE_FAIL;
+               return;
+       }
+
+       hook_add_event("channel_message");
+       hook_add_channel_message(on_channel_message);
+
+       hook_add_db_write(write_badword_db);
+
+       db_register_type_handler("BW", db_h_bw);
+
+       service_named_bind_command("chanserv", &cs_badwords);
+       command_add(&cs_set_blockbadwords, *cs_set_cmdtree);
+       command_add(&cs_set_blockbadwordsops, *cs_set_cmdtree);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_channel_message(on_channel_message);
+       hook_del_db_write(write_badword_db);
+
+       db_unregister_type_handler("BW");
+
+       service_named_unbind_command("chanserv", &cs_badwords);
+       command_delete(&cs_set_blockbadwords, *cs_set_cmdtree);
+       command_delete(&cs_set_blockbadwordsops, *cs_set_cmdtree);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/cs_badwords", MODULE_UNLOAD_CAPABILITY_OK)
index a5bbc1df4d590a5e41a69b05c2c5490f68336711..7fb3ca9afa41e26cc3a92ccbf4566741d49ce9c1 100644 (file)
@@ -13,18 +13,6 @@ static void cs_cmd_fregister(sourceinfo_t *si, int parc, char *parv[]);
 command_t cs_fregister = { "FREGISTER", N_("Forcibly registers a channel."),
                            PRIV_CHAN_ADMIN, 3, cs_cmd_fregister, { .path = "contrib/cs_fregister" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-        service_named_bind_command("chanserv", &cs_fregister);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("chanserv", &cs_fregister);
-}
-
 static void
 cs_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -146,4 +134,16 @@ cs_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+        service_named_bind_command("chanserv", &cs_fregister);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("chanserv", &cs_fregister);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/cs_fregister", MODULE_UNLOAD_CAPABILITY_OK)
index 1f77aa16bc663e5836790b869225734886e94fdf..b0b5671f14b16696f133f0ebc0f4ce8eb48f0fbf 100644 (file)
--- a/cs_ping.c
+++ b/cs_ping.c
@@ -6,22 +6,22 @@ command_t cs_ping = { "PING", "Verifies network connectivity by responding with
                        AC_NONE, 0, cs_cmd_ping, { .path = "contrib/cs_ping" } };
 
 static void
-mod_init(module_t *const restrict m)
+cs_cmd_ping(sourceinfo_t *si, int parc, char *parv[])
 {
-       service_named_bind_command("chanserv", &cs_ping);
+       command_success_nodata(si, "Pong!");
+       return;
 }
 
 static void
-mod_deinit(const module_unload_intent_t intent)
+mod_init(module_t *const restrict m)
 {
-       service_named_unbind_command("chanserv", &cs_ping);
+       service_named_bind_command("chanserv", &cs_ping);
 }
 
 static void
-cs_cmd_ping(sourceinfo_t *si, int parc, char *parv[])
+mod_deinit(const module_unload_intent_t intent)
 {
-       command_success_nodata(si, "Pong!");
-       return;
+       service_named_unbind_command("chanserv", &cs_ping);
 }
 
 SIMPLE_DECLARE_MODULE_V1("contrib/cs_ping", MODULE_UNLOAD_CAPABILITY_OK)
index 6763e884d2c0e5fc47a72d1c7aefe7b134cc68e6..f048f1f158d190f08901b1e699240a2c96e509c4 100644 (file)
@@ -13,20 +13,6 @@ static void cs_cmd_down(sourceinfo_t *si, int parc, char *parv[]);
 command_t cs_up = { "UP", "Grants all access you have permission to on a given channel.", AC_NONE, 1, cs_cmd_up, { .path = "contrib/up" } };
 command_t cs_down = { "DOWN", "Removes all current access you posess on a given channel.", AC_NONE, 1, cs_cmd_down, { .path = "contrib/down" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("chanserv", &cs_up);
-       service_named_bind_command("chanserv", &cs_down);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("chanserv", &cs_up);
-       service_named_unbind_command("chanserv", &cs_down);
-}
-
 static void
 cs_cmd_up(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -219,4 +205,18 @@ cs_cmd_down(sourceinfo_t *si, int parc, char *parv[])
        command_success_nodata(si, "Downed successfully on \2%s\2.", mc->name);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("chanserv", &cs_up);
+       service_named_bind_command("chanserv", &cs_down);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("chanserv", &cs_up);
+       service_named_unbind_command("chanserv", &cs_down);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/cs_updown", MODULE_UNLOAD_CAPABILITY_OK)
index 9883c880cfa9997992c258fc0f45e10b73442abf..632fd97bf4942ad4f4cc2d79aeaf3d6ced3a854a 100644 (file)
@@ -13,21 +13,6 @@ static void cs_cmd_userinfo(sourceinfo_t *si, int parc, char *parv[]);
 command_t cs_userinfo = { "USERINFO", N_("Sets a userinfo message."),
                        AC_NONE, 3, cs_cmd_userinfo, { .path = "contrib/userinfo" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       hook_add_event("channel_join");
-       hook_add_channel_join(userinfo_check_join);
-       service_named_bind_command("chanserv", &cs_userinfo);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_channel_join(userinfo_check_join);
-       service_named_unbind_command("chanserv", &cs_userinfo);
-}
-
 /* USERINFO <channel> [user] [message] */
 static void
 cs_cmd_userinfo(sourceinfo_t *si, int parc, char *parv[])
@@ -152,4 +137,19 @@ userinfo_check_join(hook_channel_joinpart_t *hdata)
        msg(chansvs.nick, cu->chan->name, "[%s] %s", cu->user->nick, md->value);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       hook_add_event("channel_join");
+       hook_add_channel_join(userinfo_check_join);
+       service_named_bind_command("chanserv", &cs_userinfo);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_channel_join(userinfo_check_join);
+       service_named_unbind_command("chanserv", &cs_userinfo);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/cs_userinfo", MODULE_UNLOAD_CAPABILITY_OK)
index 559558db29daa5aba5e9f8d6c6333fc0458c432b..abc0ed40030a1ea443d372528b9f1b28926efaa4 100644 (file)
@@ -15,25 +15,6 @@ static int counter;
 static void handle_verify_register(hook_user_req_t *req);
 static void hook_user_identify(user_t *u);
 
-static void
-mod_init(module_t *const restrict m)
-{
-       hook_add_event("user_verify_register");
-       hook_add_user_verify_register(handle_verify_register);
-       hook_add_event("user_identify");
-       hook_add_user_identify(hook_user_identify);
-       counter = (CURRTIME << 8) % 100000;
-       if (counter < 0)
-               counter += 100000;
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_user_verify_register(handle_verify_register);
-       hook_del_user_identify(hook_user_identify);
-}
-
 static void
 user_add_host(myuser_t *mu)
 {
@@ -109,4 +90,23 @@ hook_user_identify(user_t *u)
        user_add_host(u->myuser);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       hook_add_event("user_verify_register");
+       hook_add_user_verify_register(handle_verify_register);
+       hook_add_event("user_identify");
+       hook_add_user_identify(hook_user_identify);
+       counter = (CURRTIME << 8) % 100000;
+       if (counter < 0)
+               counter += 100000;
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_user_verify_register(handle_verify_register);
+       hook_del_user_identify(hook_user_identify);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/gen_vhostonreg", MODULE_UNLOAD_CAPABILITY_OK)
index cbeb07b1485205926fdf2b84b84ce43a5b5cdd07..228e86b6459d13c3ce19073e12258b77b238ac71 100644 (file)
@@ -11,22 +11,6 @@ static void command_roulette(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t cmd_roulette = { "ROULETTE", N_("A game of Russian Roulette."), AC_NONE, 2, command_roulette, { .path = "contrib/roulette" } };
 
-void
-mod_init(module_t * m)
-{
-       service_named_bind_command("gameserv", &cmd_roulette);
-
-       service_named_bind_command("chanserv", &cmd_roulette);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("gameserv", &cmd_roulette);
-
-       service_named_unbind_command("chanserv", &cmd_roulette);
-}
-
 /*
  * Handle reporting for both fantasy commands and normal commands in GameServ
  * quickly and easily. Of course, sourceinfo has a vtable that can be manipulated,
@@ -62,4 +46,20 @@ command_roulette(sourceinfo_t *si, int parc, char *parv[])
        gs_command_report(si, "%s", roulette_responses[rand() % 6 == 0]);
 }
 
+void
+mod_init(module_t * m)
+{
+       service_named_bind_command("gameserv", &cmd_roulette);
+
+       service_named_bind_command("chanserv", &cmd_roulette);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("gameserv", &cmd_roulette);
+
+       service_named_unbind_command("chanserv", &cmd_roulette);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/gs_roulette", MODULE_UNLOAD_CAPABILITY_OK)
index fa9ece18b69d04def86fc7e24bb43c360e9a5ba0..873a529047b4fcb0efea721e52f999a70cc6d8a3 100644 (file)
@@ -36,49 +36,6 @@ typedef struct asreq_ asreq_t;
 
 mowgli_list_t as_reqlist;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       announcesvs = service_add("announceserv", NULL);
-
-       hook_add_event("user_drop");
-       hook_add_user_drop(account_drop_request);
-
-       hook_add_db_write(write_asreqdb);
-       db_register_type_handler("AR", db_h_ar);
-
-       if (announcesvs == NULL)
-               return;
-
-       service_bind_command(announcesvs, &as_help);
-       service_bind_command(announcesvs, &as_request);
-       service_bind_command(announcesvs, &as_waiting);
-       service_bind_command(announcesvs, &as_reject);
-       service_bind_command(announcesvs, &as_activate);
-       service_bind_command(announcesvs, &as_cancel);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_user_drop(account_drop_request);
-       hook_del_db_write(write_asreqdb);
-       db_unregister_type_handler("AR");
-
-       if (announcesvs != NULL)
-       {
-               service_unbind_command(announcesvs, &as_help);
-               service_unbind_command(announcesvs, &as_request);
-               service_unbind_command(announcesvs, &as_waiting);
-               service_unbind_command(announcesvs, &as_reject);
-               service_unbind_command(announcesvs, &as_activate);
-               service_unbind_command(announcesvs, &as_cancel);
-
-               service_delete(announcesvs);
-               announcesvs = NULL;
-       }
-}
-
 static void
 write_asreqdb(database_handle_t *db)
 {
@@ -391,4 +348,47 @@ as_cmd_cancel(sourceinfo_t *si, int parc, char *parv[])
        command_fail(si, fault_badparams, _("You do not have a pending announcement to cancel."));
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       announcesvs = service_add("announceserv", NULL);
+
+       hook_add_event("user_drop");
+       hook_add_user_drop(account_drop_request);
+
+       hook_add_db_write(write_asreqdb);
+       db_register_type_handler("AR", db_h_ar);
+
+       if (announcesvs == NULL)
+               return;
+
+       service_bind_command(announcesvs, &as_help);
+       service_bind_command(announcesvs, &as_request);
+       service_bind_command(announcesvs, &as_waiting);
+       service_bind_command(announcesvs, &as_reject);
+       service_bind_command(announcesvs, &as_activate);
+       service_bind_command(announcesvs, &as_cancel);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_user_drop(account_drop_request);
+       hook_del_db_write(write_asreqdb);
+       db_unregister_type_handler("AR");
+
+       if (announcesvs != NULL)
+       {
+               service_unbind_command(announcesvs, &as_help);
+               service_unbind_command(announcesvs, &as_request);
+               service_unbind_command(announcesvs, &as_waiting);
+               service_unbind_command(announcesvs, &as_reject);
+               service_unbind_command(announcesvs, &as_activate);
+               service_unbind_command(announcesvs, &as_cancel);
+
+               service_delete(announcesvs);
+               announcesvs = NULL;
+       }
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/ircd_announceserv", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_JD_AND_TAROS)
index 982a9bed4d01acd013f9be35a375cd65d17809e4..ea520e8f26cc4c0d7cf06f9aa7a55b56fd1fbf2a 100644 (file)
@@ -17,6 +17,18 @@ command_t catserv_meow = { "MEOW", "Makes the cute little kitty-cat meow!",
 command_t catserv_help = { "HELP", "Displays contextual help information.",
                                AC_NONE, 1, catserv_cmd_help, { .path = "help" } };
 
+static void
+catserv_cmd_meow(sourceinfo_t *si, int parc, char *parv[])
+{
+       command_success_nodata(si, "Meow!");
+}
+
+static void
+catserv_cmd_help(sourceinfo_t *si, int parc, char *parv[])
+{
+       command_help(si, si->service->commands);
+}
+
 static void
 mod_init(module_t *const restrict m)
 {
@@ -35,16 +47,4 @@ mod_deinit(const module_unload_intent_t intent)
        service_delete(catserv);
 }
 
-static void
-catserv_cmd_meow(sourceinfo_t *si, int parc, char *parv[])
-{
-       command_success_nodata(si, "Meow!");
-}
-
-static void
-catserv_cmd_help(sourceinfo_t *si, int parc, char *parv[])
-{
-       command_help(si, si->service->commands);
-}
-
 SIMPLE_DECLARE_MODULE_V1("contrib/ircd_catserv", MODULE_UNLOAD_CAPABILITY_OK)
index 8e61bc0a5f2dc0ba62237b2c8c7e6a4fb6072edb..8fa48a5e2dcccad15c2bb4e02325fdfc18e0d567 100644 (file)
@@ -17,21 +17,6 @@ char * mlocktweak;
 
 static void handle_channel_register(hook_channel_req_t *hdata);
 
-static void
-mod_init(module_t *const restrict m)
-{
-       add_dupstr_conf_item("MLOCKTWEAK", &chansvs.me->conf_table, 0, &mlocktweak, "-t+c");
-       hook_add_event("channel_register");
-       hook_add_first_channel_register(handle_channel_register);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       del_conf_item("MLOCKTWEAK", &chansvs.me->conf_table);
-       hook_del_channel_register(handle_channel_register);
-}
-
 static void
 handle_channel_register(hook_channel_req_t *hdata)
 {
@@ -64,4 +49,19 @@ handle_channel_register(hook_channel_req_t *hdata)
        mc->mlock_off &= ~mc->mlock_on;
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       add_dupstr_conf_item("MLOCKTWEAK", &chansvs.me->conf_table, 0, &mlocktweak, "-t+c");
+       hook_add_event("channel_register");
+       hook_add_first_channel_register(handle_channel_register);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       del_conf_item("MLOCKTWEAK", &chansvs.me->conf_table);
+       hook_del_channel_register(handle_channel_register);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/mlocktweaker", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_NENOLOD)
index 087d9c0ef5dfb9fca51d4d7a3ebb2a2ee92b698f..6555856eb15a287dfc0f30a011fa1f144905745e 100644 (file)
@@ -15,18 +15,6 @@ static void ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[]);
 command_t ms_fsend = { "FSEND", N_("Forcibly sends a memo to a user."),
                         PRIV_MARK, 2, ms_cmd_fsend, { .path = "contrib/fsend" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-        service_named_bind_command("memoserv", &ms_fsend);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("memoserv", &ms_fsend);
-}
-
 static void
 ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -166,4 +154,16 @@ ms_cmd_fsend(sourceinfo_t *si, int parc, char *parv[])
        return;
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+        service_named_bind_command("memoserv", &ms_fsend);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("memoserv", &ms_fsend);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ms_fsend", MODULE_UNLOAD_CAPABILITY_OK)
index fcaa044425bdeac3dd8749c76a1de22e21ce9d48..7c54e965c4922719353fb3388e0516e575a62f05 100644 (file)
@@ -168,21 +168,6 @@ ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[])
 
 command_t ns_ajoin = { "AJOIN", "Manages automatic-join on identify.", AC_AUTHENTICATED, 2, ns_cmd_ajoin, { .path = "contrib/ajoin" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       hook_add_event("user_identify");
-       hook_add_user_identify(ajoin_on_identify);
-       service_named_bind_command("nickserv", &ns_ajoin);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_user_identify(ajoin_on_identify);
-       service_named_unbind_command("nickserv", &ns_ajoin);
-}
-
 static void
 ajoin_on_identify(user_t *u)
 {
@@ -211,4 +196,19 @@ ajoin_on_identify(user_t *u)
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       hook_add_event("user_identify");
+       hook_add_user_identify(ajoin_on_identify);
+       service_named_bind_command("nickserv", &ns_ajoin);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_user_identify(ajoin_on_identify);
+       service_named_unbind_command("nickserv", &ns_ajoin);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_ajoin", MODULE_UNLOAD_CAPABILITY_OK)
index ff617b50d2d9b47deaf6b0952fe30137cf3c5c6c..5ad54428d13842d25e27ca08194dcf8ca3b54094 100644 (file)
@@ -11,20 +11,6 @@ static void ns_cmd_fenforce(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t ns_fenforce = { "FENFORCE", "Enables or disables protection of another user's nicknames.", PRIV_USER_ADMIN, 2, ns_cmd_fenforce, { .path = "contrib/fenforce" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       MODULE_TRY_REQUEST_DEPENDENCY(m, "nickserv/enforce");
-
-       service_named_bind_command("nickserv", &ns_fenforce);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_fenforce);
-}
-
 static void
 ns_cmd_fenforce(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -80,4 +66,18 @@ ns_cmd_fenforce(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       MODULE_TRY_REQUEST_DEPENDENCY(m, "nickserv/enforce");
+
+       service_named_bind_command("nickserv", &ns_fenforce);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_fenforce);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_fenforce", MODULE_UNLOAD_CAPABILITY_OK)
index 919816137be32a2a20d9d9606ef84a854bb5329d..6a7d32a99e29c883d00411d316fb48f77f555160 100644 (file)
@@ -13,18 +13,6 @@ static void ns_cmd_forbid(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t ns_forbid = { "FORBID", "Disallows use of a nickname.", PRIV_USER_ADMIN, 3, ns_cmd_forbid, { .path = "contrib/forbid" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_forbid);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_forbid);
-}
-
 static void
 make_forbid(sourceinfo_t *si, const char *account, const char *reason)
 {
@@ -141,4 +129,16 @@ ns_cmd_forbid(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_forbid);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_forbid);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_forbid", MODULE_UNLOAD_CAPABILITY_OK)
index 9a8202c926599a2be8f4b4f0832bbc174b1a4cd6..3c6ec4927729e702fac3c6259d379dd02b7644cd 100644 (file)
@@ -14,18 +14,6 @@ static void ns_cmd_fregister(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t ns_fregister = { "FREGISTER", "Registers a nickname on behalf of another user.", PRIV_USER_FREGISTER, 20, ns_cmd_fregister, { .path = "contrib/fregister" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_fregister);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_fregister);
-}
-
 static void
 ns_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -114,4 +102,16 @@ ns_cmd_fregister(sourceinfo_t *si, int parc, char *parv[])
        hook_call_user_verify_register(&req);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_fregister);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_fregister);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_fregister", MODULE_UNLOAD_CAPABILITY_OK)
index db50ff1cc5e2e0cd62be74b3ac0a9c32ec6e16b5..3a9fe9cc209f72d7104b80ed50ec1ff298a38392 100644 (file)
@@ -12,18 +12,6 @@ static void ns_cmd_generatehash(sourceinfo_t *si, int parc, char *parv[]);
 command_t ns_generatehash = { "GENERATEHASH", "Generates a hash for SOPER.",
                         AC_NONE, 1, ns_cmd_generatehash, { .path = "contrib/generatehash" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_generatehash);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_generatehash);
-}
-
 static void
 ns_cmd_generatehash(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -46,4 +34,16 @@ ns_cmd_generatehash(sourceinfo_t *si, int parc, char *parv[])
        logcommand(si, CMDLOG_GET, "GENERATEHASH");
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_generatehash);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_generatehash);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_generatehash", MODULE_UNLOAD_CAPABILITY_OK)
index d540a75faa1d023b0a96526ab79645693a97f951..9969bed12cb444dc987362d7158adaf26b60641f 100644 (file)
@@ -12,18 +12,6 @@ static void ns_cmd_generatepass(sourceinfo_t *si, int parc, char *parv[]);
 command_t ns_generatepass = { "GENERATEPASS", "Generates a random password.",
                         AC_NONE, 1, ns_cmd_generatepass, { .path = "contrib/generatepass" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_generatepass);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_generatepass);
-}
-
 static void
 ns_cmd_generatepass(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -43,4 +31,16 @@ ns_cmd_generatepass(sourceinfo_t *si, int parc, char *parv[])
        logcommand(si, CMDLOG_GET, "GENERATEPASS");
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_generatepass);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_generatepass);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/ns_generatepass", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_EPIPHANIC)
index 7c4c9c79811e666fa714335361ebf03270b6f17e..a9d4c8ab925ca7145d51068e5aa684b84cef760d 100644 (file)
@@ -26,36 +26,6 @@ typedef struct goodmail_ goodmail_t;
 
 mowgli_list_t ns_maillist;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       if (!module_find_published("backend/opensex"))
-       {
-               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags = MODTYPE_FAIL;
-               return;
-       }
-
-       hook_add_event("user_can_register");
-       hook_add_user_can_register(check_registration);
-       hook_add_db_write(write_gedb);
-
-       db_register_type_handler("GE", db_h_ge);
-
-       service_named_bind_command("nickserv", &ns_goodmail);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_user_can_register(check_registration);
-       hook_del_db_write(write_gedb);
-
-       db_unregister_type_handler("GE");
-
-       service_named_unbind_command("nickserv", &ns_goodmail);
-}
-
 static void
 write_gedb(database_handle_t *db)
 {
@@ -228,4 +198,34 @@ ns_cmd_goodmail(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       if (!module_find_published("backend/opensex"))
+       {
+               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
+               m->mflags = MODTYPE_FAIL;
+               return;
+       }
+
+       hook_add_event("user_can_register");
+       hook_add_user_can_register(check_registration);
+       hook_add_db_write(write_gedb);
+
+       db_register_type_handler("GE", db_h_ge);
+
+       service_named_bind_command("nickserv", &ns_goodmail);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_user_can_register(check_registration);
+       hook_del_db_write(write_gedb);
+
+       db_unregister_type_handler("GE");
+
+       service_named_unbind_command("nickserv", &ns_goodmail);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_goodmail", MODULE_UNLOAD_CAPABILITY_OK)
index bf4992b661e10827062064bb3dff9e4f641b7ae0..b8f8115110d5251875003d2fe570786fcd7ea768 100644 (file)
@@ -11,18 +11,6 @@ static void ns_cmd_listlogins(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t ns_listlogins = { "LISTLOGINS", N_("Lists details of clients authenticated as you."), AC_AUTHENTICATED, 1, ns_cmd_listlogins, { .path = "contrib/listlogins" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_listlogins);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_listlogins);
-}
-
 static void
 ns_cmd_listlogins(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -47,4 +35,16 @@ ns_cmd_listlogins(sourceinfo_t *si, int parc, char *parv[])
        logcommand(si, CMDLOG_GET, "LISTLOGINS: (\2%d\2 matches)", matches);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_listlogins);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_listlogins);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_listlogins", MODULE_UNLOAD_CAPABILITY_OK)
index adf97b76526528db81d905e50757388922694d1b..ba33943733669ff622b922de2251d8eb6fe95a2b 100644 (file)
 static void check_registration(hook_user_register_check_t *hdata);
 int count_mx (const char *host);
 
-static void
-mod_init(module_t *const restrict m)
-{
-    hook_add_event("user_can_register");
-    hook_add_user_can_register(check_registration);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-    hook_del_user_can_register(check_registration);
-}
-
 static void
 check_registration(hook_user_register_check_t *hdata)
 {
@@ -83,6 +70,19 @@ count_mx(const char *host)
     return l;
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+    hook_add_event("user_can_register");
+    hook_add_user_can_register(check_registration);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+    hook_del_user_can_register(check_registration);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/ns_mxcheck", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_JAMIE_PENMAN)
 
 #endif
index 9316bc388fa84526c8147a6985c5ef248385c965..241631385b909385192f3bc8830f71dbfc3ddbf2 100644 (file)
@@ -23,20 +23,6 @@ static void check_registration(hook_user_register_check_t *hdata);
 
 int count_mx (const char *host);
 
-static void
-mod_init(module_t *const restrict m)
-{
-    hook_add_event("user_can_register");
-    hook_add_user_can_register(check_registration);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-    hook_del_user_can_register(check_registration);
-    childproc_delete_all(childproc_cb);
-}
-
 static void
 childproc_cb(pid_t pid, int status, void *data)
 {
@@ -147,6 +133,20 @@ count_mx(const char *host)
     return l;
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+    hook_add_event("user_can_register");
+    hook_add_user_can_register(check_registration);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+    hook_del_user_can_register(check_registration);
+    childproc_delete_all(childproc_cb);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/ns_mxcheck_async", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_JAMIE_PENMAN)
 
 #endif
index a4bf8d1ae7d0b88cf119bb21bf03ac2ca197559a..c0e88997cc2d75bf69e3a2bd6516ccfd64e6497d 100644 (file)
@@ -11,18 +11,6 @@ static void ns_cmd_sendpassmail(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t ns_sendpassmail = { "SENDPASSMAIL", N_("Email registration passwords."), AC_NONE, 2, ns_cmd_sendpassmail, { .path = "contrib/ns_sendpassmail" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("nickserv", &ns_sendpassmail);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("nickserv", &ns_sendpassmail);
-}
-
 struct sendpassmail_state
 {
        sourceinfo_t *origin;
@@ -149,4 +137,16 @@ ns_cmd_sendpassmail(sourceinfo_t *si, int parc, char *parv[])
        command_success_nodata(si, _("A password reset email has been sent for all accounts matching address \2%s\2, if any."), email);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("nickserv", &ns_sendpassmail);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("nickserv", &ns_sendpassmail);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/ns_sendpassmail", MODULE_UNLOAD_CAPABILITY_OK)
index f50abbb1aed38ab2269af5f9cdcfb88627dd0335..a50183af3296785c4398ddebbe7a3cd96cd98ee1 100644 (file)
@@ -14,23 +14,6 @@ static struct update_command_state {
        int running;
 } update_command_proc;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       hook_add_event("db_saved");
-       hook_add_db_saved(on_db_save);
-
-       add_dupstr_conf_item("db_update_command", &conf_gi_table, 0, &command, NULL);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_db_saved(on_db_save);
-
-       del_conf_item("db_update_command", &conf_gi_table);
-}
-
 static void
 update_command_finished(pid_t pid, int status, void *data)
 {
@@ -141,6 +124,23 @@ on_db_save(void *unused)
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       hook_add_event("db_saved");
+       hook_add_db_saved(on_db_save);
+
+       add_dupstr_conf_item("db_update_command", &conf_gi_table, 0, &command, NULL);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_db_saved(on_db_save);
+
+       del_conf_item("db_update_command", &conf_gi_table);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/on_db_save", MODULE_UNLOAD_CAPABILITY_OK)
 
 #endif
index 92bf6a393652437e029c6f1e2eefbf803d253f5a..97882543d7310fab9c01e55f5fb9aba4257a5088 100644 (file)
@@ -26,42 +26,6 @@ static mowgli_eventloop_timer_t *defcon_timer = NULL;
 
 command_t os_defcon = { "DEFCON", N_("Implements Defense Condition lockdowns."), PRIV_ADMIN, 1, os_cmd_defcon, { .path = "contrib/defcon" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_defcon);
-       TAINT_ON("Using os_defcon", "Use of os_defcon is unsupported and not recommend. Use only at your own risk.");
-
-       /* Hooks for all the stuff defcon disables */
-       hook_add_event("user_can_register");
-       hook_add_user_can_register(defcon_nouserreg);
-       hook_add_event("channel_can_register");
-       hook_add_channel_can_register(defcon_nochanreg);
-       hook_add_event("user_add");
-       hook_add_user_add(defcon_useradd);
-
-       service_t *svs;
-       svs = service_find("operserv");
-       add_duration_conf_item("DEFCON_TIMEOUT", &svs->conf_table, 0, &defcon_timeout, "m", 900);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_defcon);
-
-       hook_del_user_can_register(defcon_nouserreg);
-       hook_del_channel_can_register(defcon_nochanreg);
-       hook_del_user_add(defcon_useradd);
-
-       service_t *svs;
-       svs = service_find("operserv");
-       del_conf_item("DEFCON_TIMEOUT", &svs->conf_table);
-
-       if (defcon_timer != NULL)
-               mowgli_timer_destroy(base_eventloop, defcon_timer);
-}
-
 static void
 defcon_nouserreg(hook_user_register_check_t *hdata)
 {
@@ -240,4 +204,40 @@ os_cmd_defcon(sourceinfo_t *si, int parc, char *parv[])
        logcommand(si, CMDLOG_ADMIN, "DEFCON: \2%d\2", level);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_defcon);
+       TAINT_ON("Using os_defcon", "Use of os_defcon is unsupported and not recommend. Use only at your own risk.");
+
+       /* Hooks for all the stuff defcon disables */
+       hook_add_event("user_can_register");
+       hook_add_user_can_register(defcon_nouserreg);
+       hook_add_event("channel_can_register");
+       hook_add_channel_can_register(defcon_nochanreg);
+       hook_add_event("user_add");
+       hook_add_user_add(defcon_useradd);
+
+       service_t *svs;
+       svs = service_find("operserv");
+       add_duration_conf_item("DEFCON_TIMEOUT", &svs->conf_table, 0, &defcon_timeout, "m", 900);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_defcon);
+
+       hook_del_user_can_register(defcon_nouserreg);
+       hook_del_channel_can_register(defcon_nochanreg);
+       hook_del_user_add(defcon_useradd);
+
+       service_t *svs;
+       svs = service_find("operserv");
+       del_conf_item("DEFCON_TIMEOUT", &svs->conf_table);
+
+       if (defcon_timer != NULL)
+               mowgli_timer_destroy(base_eventloop, defcon_timer);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_defcon", MODULE_UNLOAD_CAPABILITY_OK)
index 1bdf041d85f7904a44f680f77b606533f4ad3e63..00dbbc09e052bf28ffddb59f0ea49b69615dbcb2 100644 (file)
@@ -11,26 +11,26 @@ command_t os_helpme = { "HELPME", N_("Makes you into a network helper."),
                         PRIV_HELPER, 0, os_cmd_helpme, { .path = "contrib/helpme" } };
 
 static void
-mod_init(module_t *const restrict m)
+os_cmd_helpme(sourceinfo_t *si, int parc, char *parv[])
 {
-       service_named_bind_command("operserv", &os_helpme);
+       service_t *svs;
+
+       svs = service_find("operserv");
+
+       sts(":%s MODE %s :+h", svs->nick, si->su->nick);
+       command_success_nodata(si, _("You are now a network helper."));
 }
 
 static void
-mod_deinit(const module_unload_intent_t intent)
+mod_init(module_t *const restrict m)
 {
-       service_named_unbind_command("operserv", &os_helpme);
+       service_named_bind_command("operserv", &os_helpme);
 }
 
 static void
-os_cmd_helpme(sourceinfo_t *si, int parc, char *parv[])
+mod_deinit(const module_unload_intent_t intent)
 {
-       service_t *svs;
-
-       svs = service_find("operserv");
-
-       sts(":%s MODE %s :+h", svs->nick, si->su->nick);
-       command_success_nodata(si, _("You are now a network helper."));
+       service_named_unbind_command("operserv", &os_helpme);
 }
 
 VENDOR_DECLARE_MODULE_V1("contrib/os_helpme", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_ELLY)
index 365e5d1e67bb6b4a36be0b7e245da57a27551a6c..4c3df8ee8fd5f98cb69b4776080cdf08a47bf0eb 100644 (file)
@@ -27,36 +27,6 @@ typedef struct joinmon_ joinmon_t;
 
 mowgli_list_t os_monlist;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       if (!module_find_published("backend/opensex"))
-       {
-               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
-               m->mflags = MODTYPE_FAIL;
-               return;
-       }
-
-       hook_add_event("channel_join");
-       hook_add_channel_join(watch_user_joins);
-       hook_add_db_write(write_jmdb);
-
-       db_register_type_handler("JM", db_h_jm);
-
-       service_named_bind_command("operserv", &os_joinmon);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       hook_del_channel_join(watch_user_joins);
-       hook_del_db_write(write_jmdb);
-
-       db_unregister_type_handler("JM");
-
-       service_named_unbind_command("operserv", &os_joinmon);
-}
-
 static void
 write_jmdb(database_handle_t *db)
 {
@@ -245,4 +215,34 @@ os_cmd_joinmon(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       if (!module_find_published("backend/opensex"))
+       {
+               slog(LG_INFO, "Module %s requires use of the OpenSEX database backend, refusing to load.", m->name);
+               m->mflags = MODTYPE_FAIL;
+               return;
+       }
+
+       hook_add_event("channel_join");
+       hook_add_channel_join(watch_user_joins);
+       hook_add_db_write(write_jmdb);
+
+       db_register_type_handler("JM", db_h_jm);
+
+       service_named_bind_command("operserv", &os_joinmon);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       hook_del_channel_join(watch_user_joins);
+       hook_del_db_write(write_jmdb);
+
+       db_unregister_type_handler("JM");
+
+       service_named_unbind_command("operserv", &os_joinmon);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_joinmon", MODULE_UNLOAD_CAPABILITY_NEVER)
index c8eb244a17da7271862d644fc7b9350430b2e76c..4d1dfc78d7086edc315c9243448a7b8a72e66748 100644 (file)
--- a/os_kill.c
+++ b/os_kill.c
@@ -16,18 +16,6 @@ static void os_cmd_kill(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t os_kill = { "KILL", "Kill a user with Services.", PRIV_OMODE, 2, os_cmd_kill, { .path = "contrib/kill" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_kill);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_kill);
-}
-
 static void
 os_cmd_kill(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -51,4 +39,16 @@ os_cmd_kill(sourceinfo_t *si, int parc, char *parv[])
        kill_user(si->service->me, target, "Requested: %s", parv[1]);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_kill);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_kill);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_kill", MODULE_UNLOAD_CAPABILITY_OK)
index d3a705dc0fa50b9796ca5e33f00178dd2e3039b8..33b462d4cc32d3160167dde12a752f8a5a74edf3 100644 (file)
@@ -19,26 +19,6 @@ command_t os_listklinechans = { "LISTKLINECHAN", "Lists active K:line channels."
 static void klinechan_check_join(hook_channel_joinpart_t *hdata);
 static void klinechan_show_info(hook_channel_req_t *hdata);
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_klinechan);
-       service_named_bind_command("operserv", &os_listklinechans);
-       hook_add_event("channel_join");
-       hook_add_first_channel_join(klinechan_check_join);
-       hook_add_event("channel_info");
-       hook_add_channel_info(klinechan_show_info);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_klinechan);
-       service_named_unbind_command("operserv", &os_listklinechans);
-       hook_del_channel_join(klinechan_check_join);
-       hook_del_channel_info(klinechan_show_info);
-}
-
 static void
 klinechan_check_join(hook_channel_joinpart_t *hdata)
 {
@@ -223,4 +203,24 @@ os_cmd_listklinechans(sourceinfo_t *si, int parc, char *parv[])
                                                    N_("\2%d\2 matches for pattern \2%s\2"), matches), matches, pattern);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_klinechan);
+       service_named_bind_command("operserv", &os_listklinechans);
+       hook_add_event("channel_join");
+       hook_add_first_channel_join(klinechan_check_join);
+       hook_add_event("channel_info");
+       hook_add_channel_info(klinechan_show_info);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_klinechan);
+       service_named_unbind_command("operserv", &os_listklinechans);
+       hook_del_channel_join(klinechan_check_join);
+       hook_del_channel_info(klinechan_show_info);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_klinechan", MODULE_UNLOAD_CAPABILITY_OK)
index 661b5cd5bd96080288bf4f8ef8f639a3809fc203..5fdaaae970668ee9a87f1afe7a55d75538b905ca 100644 (file)
@@ -12,18 +12,6 @@ static void os_cmd_modeall(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t os_modeall = { "MODEALL", N_("Changes modes on all channels."), PRIV_OMODE, 2, os_cmd_modeall, { .path = "contrib/os_modeall" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-        service_named_bind_command("operserv", &os_modeall);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_modeall);
-}
-
 static void
 set_channel_mode(service_t *s, channel_t *c, int modeparc, char *modeparv[])
 {
@@ -61,4 +49,16 @@ os_cmd_modeall(sourceinfo_t *si, int parc, char *parv[])
        logcommand(si, CMDLOG_ADMIN, "MODEALL: \2%s\2", mode);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+        service_named_bind_command("operserv", &os_modeall);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_modeall);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_modeall", MODULE_UNLOAD_CAPABILITY_OK)
index 3c4d719ffb7e3ed693d7290d517e20d015c4c34b..6d73054a7d091e28b7b2570ae0d6ff1c0970902a 100644 (file)
@@ -47,26 +47,6 @@ command_t os_autopingspam = { "AUTOPINGSPAM", "Spam connecting users with pings
 
 int spamming;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       spamming = 0;
-
-       service_named_bind_command("operserv", &os_pingspam);
-       service_named_bind_command("operserv", &os_autopingspam);
-
-       hook_add_event("user_add");
-       hook_add_user_add(user_add_hook);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_pingspam);
-       service_named_unbind_command("operserv", &os_autopingspam);
-       hook_del_user_add(user_add_hook);
-}
-
 static void
 user_add_hook(hook_user_nick_t *data)
 {
@@ -147,4 +127,24 @@ pingspam(user_t *u)
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       spamming = 0;
+
+       service_named_bind_command("operserv", &os_pingspam);
+       service_named_bind_command("operserv", &os_autopingspam);
+
+       hook_add_event("user_add");
+       hook_add_user_add(user_add_hook);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_pingspam);
+       service_named_unbind_command("operserv", &os_autopingspam);
+       hook_del_user_add(user_add_hook);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_pingspam", MODULE_UNLOAD_CAPABILITY_OK)
index 7b71d89cdc9d3e5ffe0d900b76860ca0157af991..905772d303e46b24fbb6e87b4753a151b0d40c41 100644 (file)
@@ -21,30 +21,6 @@ command_t os_procwatch = { "PROCWATCH", "Notifies snoop channel on process exit.
 
 static connection_t *kq_conn;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       int kq;
-
-       kq = kqueue();
-       if (kq == -1)
-       {
-               m->mflags = MODTYPE_FAIL;
-               return;
-       }
-       kq_conn = connection_add("procwatch kqueue", kq, 0, procwatch_readhandler, NULL);
-
-       service_named_bind_command("operserv", &os_procwatch);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       if (kq_conn != NULL)
-               connection_close_soon(kq_conn);
-       service_named_unbind_command("operserv", &os_procwatch);
-}
-
 static void
 procwatch_readhandler(connection_t *cptr)
 {
@@ -94,6 +70,30 @@ os_cmd_procwatch(sourceinfo_t *si, int parc, char *parv[])
        command_success_nodata(si, "Added pid %ld to list.", v);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       int kq;
+
+       kq = kqueue();
+       if (kq == -1)
+       {
+               m->mflags = MODTYPE_FAIL;
+               return;
+       }
+       kq_conn = connection_add("procwatch kqueue", kq, 0, procwatch_readhandler, NULL);
+
+       service_named_bind_command("operserv", &os_procwatch);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       if (kq_conn != NULL)
+               connection_close_soon(kq_conn);
+       service_named_unbind_command("operserv", &os_procwatch);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_procwatch", MODULE_UNLOAD_CAPABILITY_OK)
 
 #endif
index 63ef011ab780f5909b0d5821c3a312225ad8f2bc..4d3de2970035537b8fef9fb274b99eeeb4376096 100644 (file)
@@ -15,20 +15,6 @@ command_t os_savechanmodes = { "SAVECHANMODES", "Dumps channel modes to a file."
 command_t os_loadchanmodes = { "LOADCHANMODES", "Restores channel modes from a file.",
                           PRIV_ADMIN, 1, os_cmd_loadchanmodes, { .path = "contrib/loadchanmodes" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_savechanmodes);
-       service_named_bind_command("operserv", &os_loadchanmodes);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_savechanmodes);
-       service_named_unbind_command("operserv", &os_loadchanmodes);
-}
-
 static void
 os_cmd_savechanmodes(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -171,4 +157,18 @@ os_cmd_loadchanmodes(sourceinfo_t *si, int parc, char *parv[])
                        chansvs.nick);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_savechanmodes);
+       service_named_bind_command("operserv", &os_loadchanmodes);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_savechanmodes);
+       service_named_unbind_command("operserv", &os_loadchanmodes);
+}
+
 VENDOR_DECLARE_MODULE_V1("contrib/os_savechanmodes", MODULE_UNLOAD_CAPABILITY_OK, CONTRIB_VENDOR_JILLEST)
index fe43614c8f19bfadbf751cac00485219919307d7..f0b0411c118c1e2d7ff5acefca56a6b55c1cff0f 100644 (file)
@@ -4,18 +4,6 @@ static void os_cmd_tabletest(sourceinfo_t *si, int parc, char *parv[]);
 
 command_t os_tabletest = { "TABLETEST", "Table test.", AC_NONE, 0, os_cmd_tabletest, { .path = "" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-        service_named_bind_command("operserv", &os_tabletest);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_tabletest);
-}
-
 static void
 os_cmd_tabletest(sourceinfo_t *si, int parc, char *parv[])
 {
@@ -43,4 +31,16 @@ os_cmd_tabletest(sourceinfo_t *si, int parc, char *parv[])
        atheme_object_unref(t);
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+        service_named_bind_command("operserv", &os_tabletest);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_tabletest);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_tabletest", MODULE_UNLOAD_CAPABILITY_OK)
index 80c66070becf8f94abdfa2a2b4623402fb9fd38a..6a67152db48786ce0b4919952e6f26578a4831a5 100644 (file)
@@ -29,18 +29,6 @@ struct sourceinfo_vtable testcmd_vtable = {
        .cmd_success_string = testcmd_command_success_string
 };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_testcmd);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       service_named_unbind_command("operserv", &os_testcmd);
-}
-
 static void
 testcmd_command_fail(sourceinfo_t *si, cmd_faultcode_t code, const char *message)
 {
@@ -126,4 +114,16 @@ os_cmd_testcmd(sourceinfo_t *si, int parc, char *parv[])
                command_success_nodata(si, "Command returned without giving a result");
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_testcmd);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       service_named_unbind_command("operserv", &os_testcmd);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_testcmd", MODULE_UNLOAD_CAPABILITY_OK)
index fd20d2831c407ad1982dd68cdebaf53f29a12c3a..99d3df11a41fc4f5a78d3f145a09536da2ad295a 100644 (file)
@@ -23,20 +23,6 @@ static void os_cmd_testproc(sourceinfo_t *si, int parc, char *parv[]);
 command_t os_testproc = { "TESTPROC", "Does something with child processes.",
                         AC_NONE, 0, os_cmd_testproc, { .path = "contrib/testproc" } };
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_testproc);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       if (procdata.pip != NULL)
-               connection_close_soon(procdata.pip);
-       service_named_unbind_command("operserv", &os_testproc);
-}
-
 static void
 testproc_recvqhandler(connection_t *cptr)
 {
@@ -127,6 +113,20 @@ os_cmd_testproc(sourceinfo_t *si, int parc, char *parv[])
        }
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_testproc);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       if (procdata.pip != NULL)
+               connection_close_soon(procdata.pip);
+       service_named_unbind_command("operserv", &os_testproc);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_testproc", MODULE_UNLOAD_CAPABILITY_OK)
 
 #endif
index b77daa9da30c22d6df7a81b0f0ad78367c77a441..3424b106518687ad4785889c7c1ebfe6e69c0f17 100644 (file)
@@ -803,35 +803,6 @@ trace_action_constructor_t trace_count = { trace_count_prepare, trace_count_exec
 mowgli_patricia_t *trace_cmdtree = NULL;
 mowgli_patricia_t *trace_acttree = NULL;
 
-static void
-mod_init(module_t *const restrict m)
-{
-       service_named_bind_command("operserv", &os_trace);
-
-       trace_cmdtree = mowgli_patricia_create(strcasecanon);
-       mowgli_patricia_add(trace_cmdtree, "REGEXP", &trace_regexp);
-       mowgli_patricia_add(trace_cmdtree, "SERVER", &trace_server);
-       mowgli_patricia_add(trace_cmdtree, "GLOB", &trace_glob);
-       mowgli_patricia_add(trace_cmdtree, "CHANNEL", &trace_channel);
-       mowgli_patricia_add(trace_cmdtree, "NICKAGE", &trace_nickage);
-       mowgli_patricia_add(trace_cmdtree, "NUMCHAN", &trace_numchan);
-       mowgli_patricia_add(trace_cmdtree, "IDENTIFIED", &trace_identified);
-
-       trace_acttree = mowgli_patricia_create(strcasecanon);
-       mowgli_patricia_add(trace_acttree, "PRINT", &trace_print);
-       mowgli_patricia_add(trace_acttree, "KILL", &trace_kill);
-       mowgli_patricia_add(trace_acttree, "AKILL", &trace_akill);
-       mowgli_patricia_add(trace_acttree, "COUNT", &trace_count);
-}
-
-static void
-mod_deinit(const module_unload_intent_t intent)
-{
-       mowgli_patricia_destroy(trace_cmdtree, NULL, NULL);
-
-       service_named_unbind_command("operserv", &os_trace);
-}
-
 #define MAXMATCHES_DEF 1000
 
 static bool os_cmd_trace_run(sourceinfo_t *si, trace_action_constructor_t *actcons, trace_action_t* act, mowgli_list_t *crit, char *args);
@@ -957,4 +928,33 @@ os_cmd_trace_run(sourceinfo_t *si, trace_action_constructor_t *actcons, trace_ac
        return true;
 }
 
+static void
+mod_init(module_t *const restrict m)
+{
+       service_named_bind_command("operserv", &os_trace);
+
+       trace_cmdtree = mowgli_patricia_create(strcasecanon);
+       mowgli_patricia_add(trace_cmdtree, "REGEXP", &trace_regexp);
+       mowgli_patricia_add(trace_cmdtree, "SERVER", &trace_server);
+       mowgli_patricia_add(trace_cmdtree, "GLOB", &trace_glob);
+       mowgli_patricia_add(trace_cmdtree, "CHANNEL", &trace_channel);
+       mowgli_patricia_add(trace_cmdtree, "NICKAGE", &trace_nickage);
+       mowgli_patricia_add(trace_cmdtree, "NUMCHAN", &trace_numchan);
+       mowgli_patricia_add(trace_cmdtree, "IDENTIFIED", &trace_identified);
+
+       trace_acttree = mowgli_patricia_create(strcasecanon);
+       mowgli_patricia_add(trace_acttree, "PRINT", &trace_print);
+       mowgli_patricia_add(trace_acttree, "KILL", &trace_kill);
+       mowgli_patricia_add(trace_acttree, "AKILL", &trace_akill);
+       mowgli_patricia_add(trace_acttree, "COUNT", &trace_count);
+}
+
+static void
+mod_deinit(const module_unload_intent_t intent)
+{
+       mowgli_patricia_destroy(trace_cmdtree, NULL, NULL);
+
+       service_named_unbind_command("operserv", &os_trace);
+}
+
 SIMPLE_DECLARE_MODULE_V1("contrib/os_trace", MODULE_UNLOAD_CAPABILITY_OK)