From a3d00f20ae31b4d3b9147e5c9999739aef84f762 Mon Sep 17 00:00:00 2001 From: aquanight Date: Mon, 5 May 2008 00:40:23 +0000 Subject: Convert m_spanningtree git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9626 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket2.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/modules/m_spanningtree/treesocket2.cpp') diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 3cd2f8920..915158f8d 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -366,10 +366,8 @@ bool TreeSocket::ProcessLine(std::string &line) User* user = Instance->FindNick(prefix); if (user) { - const char* ptrs[127]; - for (size_t n = 0; (n < params.size()) && (n < 127); ++n) - ptrs[n] = params[n].c_str(); - return Utils->Creator->HandleMap(ptrs, params.size(), user); + std::vector p(params.begin(), params.end()); + return Utils->Creator->HandleMap(p, user); } } else if (command == "SERVER") @@ -549,9 +547,7 @@ bool TreeSocket::ProcessLine(std::string &line) else if (command == "MODE") { // Server-prefix MODE. - const char* modelist[MAXPARAMETERS]; - for (size_t i = 0; i < params.size(); i++) - modelist[i] = params[i].c_str(); + std::vector modelist(params.begin(), params.end()); /* We don't support this for channel mode changes any more! */ if (params.size() >= 1) @@ -564,7 +560,7 @@ bool TreeSocket::ProcessLine(std::string &line) } // Insert into the parser - this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient); + this->Instance->SendMode(modelist, this->Instance->FakeClient); // Pass out to the network return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); @@ -617,13 +613,9 @@ bool TreeSocket::ProcessLine(std::string &line) } // its a user - const char* strparams[127]; - for (unsigned int q = 0; q < params.size(); q++) - { - strparams[q] = params[q].c_str(); - } + std::vector strparams(params.begin(), params.end()); - switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who)) + switch (this->Instance->CallCommandHandler(command.c_str(), strparams, who)) { case CMD_INVALID: /* -- cgit v1.3.1-10-gc9f91