diff options
| author | 2023-05-30 20:37:27 +0100 | |
|---|---|---|
| committer | 2023-05-30 20:37:48 +0100 | |
| commit | c4858e2a110b016f19bfb6f658620ed6deb28eee (patch) | |
| tree | 17e633dc86ded8b70698f647f45e6a7092701a02 /src | |
| parent | Merge branch 'insp3' into master. (diff) | |
Convert DelLine from const char* to const std::string&.
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_xline/cmd_eline.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_xline/cmd_gline.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_xline/cmd_kline.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_xline/cmd_qline.cpp | 2 | ||||
| -rw-r--r-- | src/coremods/core_xline/cmd_zline.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_cban.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_rline.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_shun.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/delline.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_svshold.cpp | 2 | ||||
| -rw-r--r-- | src/xline.cpp | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index 3165c7290..ba459a829 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -96,7 +96,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) { std::string reason; - if (ServerInstance->XLines->DelLine(target.c_str(), "E", reason, user)) + if (ServerInstance->XLines->DelLine(target, "E", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed E-line on {}: {}", user->nick, target, reason); } diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 105bd2818..845e70421 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -106,7 +106,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) { std::string reason; - if (ServerInstance->XLines->DelLine(target.c_str(), "G", reason, user)) + if (ServerInstance->XLines->DelLine(target, "G", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed G-line on {}: {}", user->nick, target, reason); } diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index b782c6dd7..3e05bfd1b 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -105,7 +105,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) { std::string reason; - if (ServerInstance->XLines->DelLine(target.c_str(), "K", reason, user)) + if (ServerInstance->XLines->DelLine(target, "K", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed K-line on {}: {}", user->nick, target, reason); } diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index aa169ea5c..2dc7a7015 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -86,7 +86,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) { std::string reason; - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "Q", reason, user)) + if (ServerInstance->XLines->DelLine(parameters[0], "Q", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed Q-line on {}: {}", user->nick, parameters[0], reason); } diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index b42614903..eea95898a 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -103,7 +103,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) { std::string reason; - if (ServerInstance->XLines->DelLine(target.c_str(), "Z", reason, user)) + if (ServerInstance->XLines->DelLine(target, "Z", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed Z-line on {}: {}", user->nick, target, reason); } diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 7a52bae90..cd5cec9dd 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -112,7 +112,7 @@ public: { std::string reason; - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", reason, user)) + if (ServerInstance->XLines->DelLine(parameters[0], "CBAN", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed CBan on {}: {}", user->nick, parameters[0], reason); } diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index afe2edda8..96f6e9d76 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -198,7 +198,7 @@ public: { std::string reason; - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "R", reason, user)) + if (ServerInstance->XLines->DelLine(parameters[0], "R", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed R-line on {}: {}", user->nick, parameters[0], reason); } diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index fc2c848b5..60c18ef32 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -83,11 +83,11 @@ public: { std::string reason; - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", reason, user)) + if (ServerInstance->XLines->DelLine(parameters[0], "SHUN", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed SHUN on {}: {}", user->nick, parameters[0], reason); } - else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", reason, user)) + else if (ServerInstance->XLines->DelLine(target, "SHUN", reason, user)) { ServerInstance->SNO.WriteToSnoMask('x', "{} removed SHUN on {}: {}", user->nick, target, reason); } diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp index d1ec8ac7f..7920f9a1d 100644 --- a/src/modules/m_spanningtree/delline.cpp +++ b/src/modules/m_spanningtree/delline.cpp @@ -34,7 +34,7 @@ CmdResult CommandDelLine::Handle(User* user, Params& params) std::string reason; // XLineManager::DelLine() returns true if the xline existed, false if it didn't - if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], reason, user)) + if (ServerInstance->XLines->DelLine(params[1], params[0], reason, user)) { ServerInstance->SNO.WriteToSnoMask('X', "{} removed {}{} on {}: {}", setter, params[0], params[0].length() == 1 ? "-line" : "", params[1], reason); diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index a38e3a69c..5f9e489f1 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -120,7 +120,7 @@ public: { std::string reason; - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", reason, user)) + if (ServerInstance->XLines->DelLine(parameters[0], "SVSHOLD", reason, user)) { if (!silent) ServerInstance->SNO.WriteToSnoMask('x', "{} removed SVSHOLD on {}: {}", user->nick, parameters[0], reason); diff --git a/src/xline.cpp b/src/xline.cpp index 8b96e4909..46cdca560 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -334,7 +334,7 @@ bool XLineManager::AddLine(XLine* line, User* user) // deletes a line, returns true if the line existed and was removed -bool XLineManager::DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate) +bool XLineManager::DelLine(const std::string& hostmask, const std::string& type, std::string& reason, User* user, bool simulate) { ContainerIter x = lookup_lines.find(type); |
