From ab8771aae391a79ebd7c8696bbadbe2f9d9bcd23 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 9 Aug 2019 21:27:12 -0700 Subject: [PATCH] modules: Fix various hookfn instance constness. --- modules/client/rooms/invite.cc | 2 +- modules/conf.cc | 6 +++--- modules/m_command.cc | 2 +- modules/m_control.cc | 4 ++-- modules/m_device_list_update.cc | 2 +- modules/m_direct.cc | 2 +- modules/m_ignored_user_list.cc | 2 +- modules/m_listen.cc | 2 +- modules/m_receipt.cc | 6 +++--- modules/m_room_canonical_alias.cc | 2 +- modules/m_room_history_visibility.cc | 2 +- modules/m_room_join_rules.cc | 4 ++-- modules/m_typing.cc | 2 +- modules/m_user_profile.cc | 2 +- modules/net_dns.cc | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/client/rooms/invite.cc b/modules/client/rooms/invite.cc index 42482a344..c2b32c4f0 100644 --- a/modules/client/rooms/invite.cc +++ b/modules/client/rooms/invite.cc @@ -15,7 +15,7 @@ namespace ircd::m static event::id::buf invite_foreign(const event &); static void on_invite_foreign(const event &, vm::eval &); - extern const hookfn invite_foreign_hook; + extern hookfn invite_foreign_hook; } decltype(ircd::m::invite_foreign_hook) diff --git a/modules/conf.cc b/modules/conf.cc index 1575a37db..0a6458095 100644 --- a/modules/conf.cc +++ b/modules/conf.cc @@ -180,7 +180,7 @@ handle_conf_updated(const m::event &event, conf_updated(event); } -const m::hookfn +m::hookfn conf_updated_hook { handle_conf_updated, @@ -244,7 +244,7 @@ handle_init_conf_items(const m::event &, init_conf_items(); } -const m::hookfn +m::hookfn init_conf_items_hook { handle_init_conf_items, @@ -290,7 +290,7 @@ create_conf_room(const m::event &, rehash_conf({}, true); } -const m::hookfn +m::hookfn create_conf_room_hook { create_conf_room, diff --git a/modules/m_command.cc b/modules/m_command.cc index c7146cf36..f8ebc7011 100644 --- a/modules/m_command.cc +++ b/modules/m_command.cc @@ -28,7 +28,7 @@ static void handle_command(const m::event &event, m::vm::eval &eval); -const m::hookfn +m::hookfn command_hook { handle_command, diff --git a/modules/m_control.cc b/modules/m_control.cc index 49e0bd5e7..6e5991caa 100644 --- a/modules/m_control.cc +++ b/modules/m_control.cc @@ -108,7 +108,7 @@ catch(const std::exception &e) notice(control_room, e.what()); } -const m::hookfn +m::hookfn command_control_hook { command_control, @@ -138,7 +138,7 @@ create_control_room(const m::event &, notice(control_room, m::me.user_id, "I am the daemon. You can talk to me in this room by highlighting me."); } -const m::hookfn +m::hookfn create_control_hook { create_control_room, diff --git a/modules/m_device_list_update.cc b/modules/m_device_list_update.cc index 2a0963005..3445e15c3 100644 --- a/modules/m_device_list_update.cc +++ b/modules/m_device_list_update.cc @@ -20,7 +20,7 @@ static void handle_edu_m_device_list_update(const m::event &, m::vm::eval &); -const m::hookfn +m::hookfn _m_device_list_update_eval { handle_edu_m_device_list_update, diff --git a/modules/m_direct.cc b/modules/m_direct.cc index 9bf98797c..64766e3ac 100644 --- a/modules/m_direct.cc +++ b/modules/m_direct.cc @@ -20,7 +20,7 @@ static void _join_room__m_direct(const m::event &event, m::vm::eval &eval); -const m::hookfn +m::hookfn _join_room__m_direct_hookfn { { diff --git a/modules/m_ignored_user_list.cc b/modules/m_ignored_user_list.cc index 1e145c78a..d8d1c5958 100644 --- a/modules/m_ignored_user_list.cc +++ b/modules/m_ignored_user_list.cc @@ -34,7 +34,7 @@ enforce_events }; /* -const m::hookfn +m::hookfn _m_ignored_user_list { handle_m_ignored_user_list, diff --git a/modules/m_listen.cc b/modules/m_listen.cc index 6ee9c1e02..9f7a07f6a 100644 --- a/modules/m_listen.cc +++ b/modules/m_listen.cc @@ -130,7 +130,7 @@ create_listener(const m::event &event, } /// Hook for a new listener description being sent. -const m::hookfn +m::hookfn create_listener_hook { create_listener, diff --git a/modules/m_receipt.cc b/modules/m_receipt.cc index d6cf2a67c..58b521a93 100644 --- a/modules/m_receipt.cc +++ b/modules/m_receipt.cc @@ -11,17 +11,17 @@ using namespace ircd; static void handle_ircd_m_read(const m::event &, m::vm::eval &); -extern const m::hookfn _ircd_read_eval; +extern m::hookfn _ircd_read_eval; static void handle_implicit_receipt(const m::event &, m::vm::eval &); -extern const m::hookfn _implicit_receipt; +extern m::hookfn _implicit_receipt; static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::event::id &, const time_t &); static void handle_m_receipt_m_read(const m::room::id &, const m::user::id &, const m::edu::m_receipt::m_read &); static void handle_m_receipt_m_read(const m::event &, const m::room::id &, const json::object &); static void handle_m_receipt(const m::event &, const m::room::id &, const json::object &); static void handle_edu_m_receipt(const m::event &, m::vm::eval &); -extern const m::hookfn _m_receipt_eval; +extern m::hookfn _m_receipt_eval; mapi::header IRCD_MODULE diff --git a/modules/m_room_canonical_alias.cc b/modules/m_room_canonical_alias.cc index d61a2ad73..72503708f 100644 --- a/modules/m_room_canonical_alias.cc +++ b/modules/m_room_canonical_alias.cc @@ -14,7 +14,7 @@ namespace ircd::m extern const room alias_room; extern const room::id::buf alias_room_id; - extern const hookfn changed_canonical_alias_hookfn; + extern hookfn changed_canonical_alias_hookfn; } ircd::mapi::header diff --git a/modules/m_room_history_visibility.cc b/modules/m_room_history_visibility.cc index d6c432359..84a737c84 100644 --- a/modules/m_room_history_visibility.cc +++ b/modules/m_room_history_visibility.cc @@ -164,7 +164,7 @@ _changed_visibility(const m::event &event, }; } -const m::hookfn +m::hookfn _changed_visibility_hookfn { _changed_visibility, diff --git a/modules/m_room_join_rules.cc b/modules/m_room_join_rules.cc index 1da4e1363..6c29e7aec 100644 --- a/modules/m_room_join_rules.cc +++ b/modules/m_room_join_rules.cc @@ -45,7 +45,7 @@ _changed_rules(const m::event &event, m::rooms::summary_set(room_id, json::object{}); } -const m::hookfn +m::hookfn _changed_rules_hookfn { _changed_rules, @@ -69,7 +69,7 @@ _changed_rules_notify(const m::event &event, }; } -const m::hookfn +m::hookfn _changed_rules_notify_hookfn { _changed_rules_notify, diff --git a/modules/m_typing.cc b/modules/m_typing.cc index b502b85c7..da5ad8160 100644 --- a/modules/m_typing.cc +++ b/modules/m_typing.cc @@ -130,7 +130,7 @@ static void handle_edu_m_typing(const m::event &, m::vm::eval &); /// a new event formatted for client /sync and then runs that through eval /// so our clients can receive the typing events. /// -const m::hookfn +m::hookfn _m_typing_eval { handle_edu_m_typing, diff --git a/modules/m_user_profile.cc b/modules/m_user_profile.cc index 4158be63e..b56d7957d 100644 --- a/modules/m_user_profile.cc +++ b/modules/m_user_profile.cc @@ -22,7 +22,7 @@ IRCD_MODULE "Matrix user profiles." }; -const m::hookfn +m::hookfn my_profile_changed { handle_my_profile_changed, diff --git a/modules/net_dns.cc b/modules/net_dns.cc index ec23e6f49..cae25dd2b 100644 --- a/modules/net_dns.cc +++ b/modules/net_dns.cc @@ -905,7 +905,7 @@ namespace ircd::net::dns::cache static void create_room(); extern bool room_exists; - extern const m::hookfn create_room_hook; + extern m::hookfn create_room_hook; extern const ircd::run::changed create_room_hook_alt; }