From 0646547c9eecc464dfc3c6fb0c7dfa9a3298a268 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 28 May 2023 20:40:00 -0400 Subject: config: remove dependency on no-delete-null-pointer-checks --- modules/commands/os_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/commands') diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp index 701cdc1f9..d54730462 100644 --- a/modules/commands/os_config.cpp +++ b/modules/commands/os_config.cpp @@ -32,7 +32,7 @@ class CommandOSConfig : public Command return; } - Configuration::Block *block = Config->GetBlock(params[1]); + Configuration::MutableBlock *block = Config->GetMutableBlock(params[1]); if (!block) block = Config->GetModule(params[1]); -- cgit From 66f37139cba97f2bb2a490376ffc33f153900b6c Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 28 May 2023 21:25:02 -0400 Subject: regchannels: remove dependency on no-delete-null-pointer-checks --- modules/commands/ns_recover.cpp | 2 +- modules/commands/os_mode.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/commands') diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp index 20309cf86..67994a983 100644 --- a/modules/commands/ns_recover.cpp +++ b/modules/commands/ns_recover.cpp @@ -284,7 +284,7 @@ class NSRecover : public Module if (it != ei->end()) { for (size_t i = 0; i < it->second.Modes().length(); ++i) - c->SetMode(c->ci->WhoSends(), ModeManager::FindChannelModeByChar(it->second.Modes()[i]), u->GetUID()); + c->SetMode(c->WhoSends(), ModeManager::FindChannelModeByChar(it->second.Modes()[i]), u->GetUID()); ei->erase(it); if (ei->empty()) diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp index 11fd8da03..0710065ea 100644 --- a/modules/commands/os_mode.cpp +++ b/modules/commands/os_mode.cpp @@ -37,7 +37,7 @@ class CommandOSMode : public Command const Channel::ModeList chmodes = c->GetModes(); for (Channel::ModeList::const_iterator it = chmodes.begin(), it_end = chmodes.end(); it != it_end && c; ++it) - c->RemoveMode(c->ci->WhoSends(), it->first, it->second, false); + c->RemoveMode(c->WhoSends(), it->first, it->second, false); if (!c) { @@ -55,7 +55,7 @@ class CommandOSMode : public Command continue; for (size_t i = uc->status.Modes().length(); i > 0; --i) - c->RemoveMode(c->ci->WhoSends(), ModeManager::FindChannelModeByChar(uc->status.Modes()[i - 1]), uc->user->GetUID(), false); + c->RemoveMode(c->WhoSends(), ModeManager::FindChannelModeByChar(uc->status.Modes()[i - 1]), uc->user->GetUID(), false); } source.Reply(_("All modes cleared on %s."), c->name.c_str()); -- cgit