diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-06-12 19:30:15 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-06-12 19:30:15 +0200 |
| commit | c23d09f65084e6088111dc974f0e290b042de89d (patch) | |
| tree | adf4e9b60d41019980f2e85bcaceeb843cad2af0 /src/modules/m_spanningtree | |
| parent | 79f46c80c2df066e88c18322a2168a144087b811 (diff) | |
Simplify stringjoiner: take 1 parameter, join from begin() to end() and use space as the sep char
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index fa10c79fe..1ca5b982c 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -66,7 +66,7 @@ static std::string BuildModeList(ModeType type) } } sort(modes.begin(), modes.end()); - irc::stringjoiner line(" ", modes, 0, modes.size() - 1); + irc::stringjoiner line(modes); return line.GetJoined(); } diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 1b3b9dae2..42fb708a9 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -472,7 +472,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, if (!cmd) { - irc::stringjoiner pmlist(" ", params, 0, params.size() - 1); + irc::stringjoiner pmlist(params); ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Unrecognised S2S command :%s %s %s", who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); SendError("Unrecognised command '" + command + "' -- possibly loaded mismatched modules"); @@ -481,7 +481,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, if (params.size() < cmd->min_params) { - irc::stringjoiner pmlist(" ", params, 0, params.size() - 1); + irc::stringjoiner pmlist(params); ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s", who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); SendError("Insufficient parameters for command '" + command + "'"); @@ -500,7 +500,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, if (res == CMD_INVALID) { - irc::stringjoiner pmlist(" ", params, 0, params.size() - 1); + irc::stringjoiner pmlist(params); ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Error handling S2S command :%s %s %s", who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str()); SendError("Error handling '" + command + "' -- possibly loaded mismatched modules"); |