From ef594e2f9e2be8d1b3f8e9be64efad8afee2a909 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 4 Sep 2022 01:26:58 +0100 Subject: Fix unnecessarily using c_str in parameters that take a std::string. --- src/coremods/core_xline/cmd_eline.cpp | 2 +- src/coremods/core_xline/cmd_gline.cpp | 2 +- src/coremods/core_xline/cmd_kline.cpp | 2 +- src/coremods/core_xline/cmd_qline.cpp | 2 +- src/coremods/core_xline/cmd_zline.cpp | 2 +- src/modulemanager.cpp | 2 +- src/modules/m_cban.cpp | 2 +- src/modules/m_filter.cpp | 12 ++++++------ src/modules/m_globalload.cpp | 8 ++++---- src/modules/m_rline.cpp | 4 ++-- src/modules/m_shun.cpp | 2 +- src/modules/m_svshold.cpp | 2 +- src/xline.cpp | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index a300c2a5b..c55c1e853 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -71,7 +71,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) user->WriteNotice("*** Invalid duration for E-line."); return CMD_FAILURE; } - ELine* el = new ELine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); + ELine* el = new ELine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); if (ServerInstance->XLines->AddLine(el, user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 9b3c6d687..34401f685 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -78,7 +78,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) user->WriteNotice("*** Invalid duration for G-line."); return CMD_FAILURE; } - GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); + GLine* gl = new GLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); if (ServerInstance->XLines->AddLine(gl, user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 2e857f6c4..b182bfc73 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -78,7 +78,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) user->WriteNotice("*** Invalid duration for K-line."); return CMD_FAILURE; } - KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); + KLine* kl = new KLine(ServerInstance->Time(), duration, user->nick, parameters[2], ih.first, ih.second); if (ServerInstance->XLines->AddLine(kl,user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index 5ef3f18c5..8d802d88d 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -58,7 +58,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) user->WriteNotice("*** Invalid duration for Q-line."); return CMD_FAILURE; } - QLine* ql = new QLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + QLine* ql = new QLine(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); if (ServerInstance->XLines->AddLine(ql,user)) { if (!duration) diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index 724cd4ced..4a4740900 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -76,7 +76,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) user->WriteNotice("*** Invalid duration for Z-line."); return CMD_FAILURE; } - ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), ipaddr); + ZLine* zl = new ZLine(ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); if (ServerInstance->XLines->AddLine(zl,user)) { if (!duration) diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index fad415fcd..987cbb04c 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -54,7 +54,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer) } Module* newmod = NULL; - DLLManager* newhandle = new DLLManager(moduleFile.c_str()); + DLLManager* newhandle = new DLLManager(moduleFile); ServiceList newservices; if (!defer) this->NewServices = &newservices; diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index a434c70e3..0f2ca25dc 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -135,7 +135,7 @@ class CommandCBan : public Command return CMD_FAILURE; } const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied"; - CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str()); + CBan* r = new CBan(ServerInstance->Time(), duration, user->nick, reason, parameters[0]); if (ServerInstance->XLines->AddLine(r, user)) { diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 6793cf1dc..2220d6ebe 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -465,7 +465,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar } else if (f->action == FA_SHUN && (ServerInstance->XLines->GetFactory("SHUN"))) { - Shun* sh = new Shun(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), user->GetIPString()); + Shun* sh = new Shun(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was shunned for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), sh->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), @@ -479,7 +479,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar } else if (f->action == FA_GLINE) { - GLine* gl = new GLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString()); + GLine* gl = new GLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, "*", user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was G-lined for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), gl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), @@ -493,7 +493,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, const MessageTarget& msgtar } else if (f->action == FA_ZLINE) { - ZLine* zl = new ZLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), user->GetIPString()); + ZLine* zl = new ZLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was Z-lined for %s (expires on %s) because their message to %s matched %s (%s)", user->nick.c_str(), zl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + f->duration).c_str(), @@ -570,7 +570,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params& if (f->action == FA_GLINE) { /* Note: We G-line *@IP so that if their host doesn't resolve the G-line still applies. */ - GLine* gl = new GLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString()); + GLine* gl = new GLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, "*", user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was G-lined for %s (expires on %s) because their %s message matched %s (%s)", user->nick.c_str(), gl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), @@ -586,7 +586,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params& } if (f->action == FA_ZLINE) { - ZLine* zl = new ZLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), user->GetIPString()); + ZLine* zl = new ZLine(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was Z-lined for %s (expires on %s) because their %s message matched %s (%s)", user->nick.c_str(), zl->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), @@ -603,7 +603,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params& else if (f->action == FA_SHUN && (ServerInstance->XLines->GetFactory("SHUN"))) { /* Note: We shun *!*@IP so that if their host doesnt resolve the shun still applies. */ - Shun* sh = new Shun(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), user->GetIPString()); + Shun* sh = new Shun(ServerInstance->Time(), f->duration, ServerInstance->Config->ServerName, f->reason, user->GetIPString()); ServerInstance->SNO->WriteGlobalSno('f', InspIRCd::Format("%s (%s) was shunned for %s (expires on %s) because their %s message matched %s (%s)", user->nick.c_str(), sh->Displayable().c_str(), InspIRCd::DurationString(f->duration).c_str(), diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 01e9bbc6d..4fb553120 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -41,9 +41,9 @@ class CommandGLoadModule : public Command { std::string servername = parameters.size() > 1 ? parameters[1] : "*"; - if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { - if (ServerInstance->Modules->Load(parameters[0].c_str())) + if (ServerInstance->Modules->Load(parameters[0])) { ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded."); @@ -88,7 +88,7 @@ class CommandGUnloadModule : public Command std::string servername = parameters.size() > 1 ? parameters[1] : "*"; - if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { Module* m = ServerInstance->Modules->Find(parameters[0]); if (m) @@ -133,7 +133,7 @@ class CommandGReloadModule : public Command { std::string servername = parameters.size() > 1 ? parameters[1] : "*"; - if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) { Module* m = ServerInstance->Modules->Find(parameters[0]); if (m) diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index d8da60be6..0ee0ae022 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -72,7 +72,7 @@ class RLine : public XLine { if (ZlineOnMatch) { - ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, MODNAME "@" + ServerInstance->Config->ServerName, reason.c_str(), u->GetIPString()); + ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, MODNAME "@" + ServerInstance->Config->ServerName, reason, u->GetIPString()); if (ServerInstance->XLines->AddLine(zl, NULL)) { if (!duration) @@ -160,7 +160,7 @@ class CommandRLine : public Command try { - r = factory.Generate(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + r = factory.Generate(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); } catch (ModuleException &e) { diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 8268f632c..a09ebd44d 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -114,7 +114,7 @@ class CommandShun : public Command expr = parameters[1]; } - Shun* r = new Shun(ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); + Shun* r = new Shun(ServerInstance->Time(), duration, user->nick, expr, target); if (ServerInstance->XLines->AddLine(r, user)) { if (!duration) diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index d04281f26..7bd8a82d4 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -138,7 +138,7 @@ class CommandSvshold : public Command user->WriteNotice("*** Invalid duration for SVSHOLD."); return CMD_FAILURE; } - SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); if (ServerInstance->XLines->AddLine(r, user)) { diff --git a/src/xline.cpp b/src/xline.cpp index 4de33f768..c45ea56ce 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -718,7 +718,7 @@ bool ELine::Matches(const std::string &str) bool KLine::Matches(const std::string &str) { - return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); + return (InspIRCd::MatchCIDR(str, matchtext)); } bool GLine::Matches(const std::string &str) -- cgit v1.3.1-10-gc9f91