diff options
| author | Peter Powell <petpow@saberuk.com> | 2014-02-05 16:44:22 +0000 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-02-06 23:11:51 +0100 |
| commit | 9dd4108273d95204edbc366618da6500571267df (patch) | |
| tree | 2e78f10477d88e2fdb288d17cfded87b10fa2313 /src/modules/m_spanningtree | |
| parent | db0e78c5d2e0998591b274c027fef26e1ac6ce6a (diff) | |
Convert irc::stringjoiner to be a method instead of a class.
Add separator parameter
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/capab.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
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) |