diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hashcomp.cpp | 8 | ||||
| -rw-r--r-- | src/modules/m_cap.cpp | 8 | ||||
| -rw-r--r-- | src/modules/m_operlog.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 9 |
5 files changed, 14 insertions, 17 deletions
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index f1d0f0678..32f74475f 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -414,14 +414,16 @@ int irc::modestacker::GetStackedLine(std::vector<std::string> &result, int max_l return n; } -irc::stringjoiner::stringjoiner(const std::vector<std::string>& sequence) +std::string irc::stringjoiner(const std::vector<std::string>& sequence, char separator) { + std::string joined; if (sequence.empty()) - return; // nothing to do here + return joined; // nothing to do here for (std::vector<std::string>::const_iterator i = sequence.begin(); i != sequence.end(); ++i) - joined.append(*i).push_back(' '); + joined.append(*i).push_back(separator); joined.erase(joined.end()-1); + return joined; } irc::portparser::portparser(const std::string &source, bool allow_overlapped) diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 9e074b219..bc79e59ec 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -74,13 +74,13 @@ class CommandCAP : public Command if (Data.ack.size() > 0) { - std::string AckResult = irc::stringjoiner(Data.ack).GetJoined(); + std::string AckResult = irc::stringjoiner(Data.ack); user->WriteCommand("CAP", "ACK :" + AckResult); } if (Data.wanted.size() > 0) { - std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined(); + std::string NakResult = irc::stringjoiner(Data.wanted); user->WriteCommand("CAP", "NAK :" + NakResult); } } @@ -95,7 +95,7 @@ class CommandCAP : public Command reghold.set(user, 1); Data.Send(); - std::string Result = irc::stringjoiner(Data.wanted).GetJoined(); + std::string Result = irc::stringjoiner(Data.wanted); user->WriteCommand("CAP", subcommand + " :" + Result); } else if (subcommand == "CLEAR") @@ -105,7 +105,7 @@ class CommandCAP : public Command reghold.set(user, 1); Data.Send(); - std::string Result = irc::stringjoiner(Data.ack).GetJoined(); + std::string Result = irc::stringjoiner(Data.ack); user->WriteCommand("CAP", "ACK :" + Result); } else diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp index 0da0c1f20..e89dda7b5 100644 --- a/src/modules/m_operlog.cpp +++ b/src/modules/m_operlog.cpp @@ -52,8 +52,7 @@ class ModuleOperLog : public Module Command* thiscommand = ServerInstance->Parser->GetHandler(command); if ((thiscommand) && (thiscommand->flags_needed == 'o')) { - std::string line = irc::stringjoiner(parameters).GetJoined(); - std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + line; + std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + irc::stringjoiner(parameters); ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "OPERLOG: " + msg); if (tosnomask) ServerInstance->SNO->WriteGlobalSno('r', msg); diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 07d11ad83..c52dffa41 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -70,8 +70,7 @@ static std::string BuildModeList(ModeType type) } } sort(modes.begin(), modes.end()); - irc::stringjoiner line(modes); - return line.GetJoined(); + return irc::stringjoiner(modes); } void TreeSocket::SendCapabilities(int phase) diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index f97ce5539..4639a237e 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -313,9 +313,8 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, return; } - irc::stringjoiner pmlist(params); ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Unrecognised S2S command :%s %s %s", - who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); + who->uuid.c_str(), command.c_str(), irc::stringjoiner(params).c_str()); SendError("Unrecognised command '" + command + "' -- possibly loaded mismatched modules"); return; } @@ -324,9 +323,8 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, if (params.size() < cmdbase->min_params) { - irc::stringjoiner pmlist(params); ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s", - who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); + who->uuid.c_str(), command.c_str(), irc::stringjoiner(params).c_str()); SendError("Insufficient parameters for command '" + command + "'"); return; } @@ -347,9 +345,8 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, if (res == CMD_INVALID) { - irc::stringjoiner pmlist(params); ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Error handling S2S command :%s %s %s", - who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); + who->uuid.c_str(), command.c_str(), irc::stringjoiner(params).c_str()); SendError("Error handling '" + command + "' -- possibly loaded mismatched modules"); } else if (res == CMD_SUCCESS) |