pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-07 18:03:13 +02:00
Code Activity

Return references instead of pointers from the config system.

Browse Source 
We used to return NULL from these methods but now we return an empty
block so this can never actually be null now.
This commit is contained in:
Sadie Powell
2025-03-02 14:51:02 +00:00
parent a5e5eb5eb0
commit f9911dde52
124 changed files with 811 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/chanserv/cs_access.cpp
+10 -10
View File
@@ -134,7 +134,7 @@ class CommandCSAccess final
if (IRCD->IsChannelValid(mask))
{
if (Config->GetModule("chanserv")->Get<bool>("disallow_channel_access"))
if (Config->GetModule("chanserv").Get<bool>("disallow_channel_access"))
{
source.Reply(_("Channels may not be on access lists."));
return;
@@ -158,7 +158,7 @@ class CommandCSAccess final
{
na = NickAlias::Find(mask);
if (!na && Config->GetModule("chanserv")->Get<bool>("disallow_hostmask_access"))
if (!na && Config->GetModule("chanserv").Get<bool>("disallow_hostmask_access"))
{
source.Reply(_("Masks and unregistered users may not be on access lists."));
return;
@@ -205,7 +205,7 @@ class CommandCSAccess final
}
}
unsigned access_max = Config->GetModule("chanserv")->Get<unsigned>("accessmax", "1000");
unsigned access_max = Config->GetModule("chanserv").Get<unsigned>("accessmax", "1000");
if (access_max && ci->GetDeepAccessCount() >= access_max)
{
source.Reply(_("Sorry, you can only have %d access entries on a channel, including access entries from other channels."), access_max);
@@ -601,7 +601,7 @@ public:
"may be a numerical level or the name of a privilege (eg AUTOOP).\n"
"When a user joins the channel the access they receive is from the\n"
"highest level entry in the access list."));
if (!Config->GetModule("chanserv")->Get<bool>("disallow_channel_access"))
if (!Config->GetModule("chanserv").Get<bool>("disallow_channel_access"))
source.Reply(_("The given mask may also be a channel, which will use the\n"
"access list from the other channel up to the given \037level\037."));
source.Reply(" ");
@@ -878,21 +878,21 @@ public:
}
void OnReload(Configuration::Conf *conf) override
void OnReload(Configuration::Conf &conf) override
{
defaultLevels.clear();
for (int i = 0; i < conf->CountBlock("privilege"); ++i)
for (int i = 0; i < conf.CountBlock("privilege"); ++i)
{
Configuration::Block *priv = conf->GetBlock("privilege", i);
Configuration::Block &priv = conf.GetBlock("privilege", i);
const Anope::string &pname = priv->Get<const Anope::string>("name");
const Anope::string &pname = priv.Get<const Anope::string>("name");
Privilege *p = PrivilegeManager::FindPrivilege(pname);
if (p == NULL)
continue;
const Anope::string &value = priv->Get<const Anope::string>("level");
const Anope::string &value = priv.Get<const Anope::string>("level");
if (value.empty())
continue;
else if (value.equals_ci("founder"))
@@ -900,7 +900,7 @@ public:
else if (value.equals_ci("disabled"))
defaultLevels[p->name] = ACCESS_INVALID;
else
defaultLevels[p->name] = priv->Get<int16_t>("level");
defaultLevels[p->name] = priv.Get<int16_t>("level");
}
}