m_operjoin Remove duplicated code

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket2.cpp

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index f97ce55397f00cd16ba1f111493e94f5ddf50726..4639a237ede4f329a5f4a2ed9f6a475c27330928 100644 (file)
--- 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)