diff options
| author | Sadie Powell <sadie@witchery.services> | 2025-03-02 14:51:02 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2025-03-02 15:27:47 +0000 |
| commit | f9911dde529adf3dc03f4f14bbd70756ac2f665c (patch) | |
| tree | 7c720e4f82fdb30b7d8a22fc0809f50bc862fae3 /modules/irc2sql | |
| parent | a5e5eb5eb084e8343260ce7bc26ea86798f64fe1 (diff) | |
Return references instead of pointers from the config system.
We used to return NULL from these methods but now we return an empty
block so this can never actually be null now.
Diffstat (limited to 'modules/irc2sql')
| -rw-r--r-- | modules/irc2sql/irc2sql.cpp | 16 | ||||
| -rw-r--r-- | modules/irc2sql/irc2sql.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/modules/irc2sql/irc2sql.cpp b/modules/irc2sql/irc2sql.cpp index c288a2366..3c6ab9199 100644 --- a/modules/irc2sql/irc2sql.cpp +++ b/modules/irc2sql/irc2sql.cpp @@ -17,21 +17,21 @@ void IRC2SQL::OnShutdown() quitting = true; } -void IRC2SQL::OnReload(Configuration::Conf *conf) +void IRC2SQL::OnReload(Configuration::Conf &conf) { - Configuration::Block *block = Config->GetModule(this); - prefix = block->Get<const Anope::string>("prefix", "anope_"); - GeoIPDB = block->Get<const Anope::string>("geoip_database"); - ctcpuser = block->Get<bool>("ctcpuser", "no"); - ctcpeob = block->Get<bool>("ctcpeob", "yes"); - Anope::string engine = block->Get<const Anope::string>("engine"); + Configuration::Block &block = Config->GetModule(this); + prefix = block.Get<const Anope::string>("prefix", "anope_"); + GeoIPDB = block.Get<const Anope::string>("geoip_database"); + ctcpuser = block.Get<bool>("ctcpuser", "no"); + ctcpeob = block.Get<bool>("ctcpeob", "yes"); + Anope::string engine = block.Get<const Anope::string>("engine"); this->sql = ServiceReference<SQL::Provider>("SQL::Provider", engine); if (sql) this->CheckTables(); else Log() << "IRC2SQL: no database connection to " << engine; - const Anope::string &snick = block->Get<const Anope::string>("client"); + const Anope::string &snick = block.Get<const Anope::string>("client"); if (snick.empty()) throw ConfigException(Module::name + ": <client> must be defined"); StatServ = BotInfo::Find(snick, true); diff --git a/modules/irc2sql/irc2sql.h b/modules/irc2sql/irc2sql.h index 27e1dee13..52a15e7f6 100644 --- a/modules/irc2sql/irc2sql.h +++ b/modules/irc2sql/irc2sql.h @@ -61,7 +61,7 @@ public: } void OnShutdown() override; - void OnReload(Configuration::Conf *config) override; + void OnReload(Configuration::Conf &config) override; void OnNewServer(Server *server) override; void OnServerQuit(Server *server) override; void OnUserConnect(User *u, bool &exempt) override; |