From ffbd1eebf0b82bf40482879f410f58874030a695 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 4 May 2008 21:37:36 +0000 Subject: Conversion of command handler params from "const char* const* parameters, int pcnt" to "const std::vector& parameters". All of core is converted, but cant test it till the modules are converted. IMPORTANT: The mode parser public calls have had to be tweaked a bit to also use the string vector. Note that this makes a LOT of our core a bit messy and paves the way to convert a lot of stuff from the mess of .c_str() calls to using std::string params directly. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9608 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/mode.cpp | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'src/mode.cpp') diff --git a/src/mode.cpp b/src/mode.cpp index 8712e63b5..d73a5d1b8 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -354,7 +354,7 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ return; } -void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bool servermode) +void ModeParser::Process(const std::vector& parameters, User *user, bool servermode) { std::string target = parameters[0]; ModeType type = MODETYPE_USER; @@ -367,9 +367,9 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo /* Special case for displaying the list for listmodes, * e.g. MODE #chan b, or MODE #chan +b without a parameter */ - if ((targetchannel) && (pcnt == 2)) + if ((targetchannel) && (parameters.size() == 2)) { - const char* mode = parameters[1]; + const char* mode = parameters[1].c_str(); int nonlistmodes_found = 0; seq++; @@ -445,11 +445,11 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo return; } - if (pcnt == 1) + if (parameters.size() == 1) { - this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]); + this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str()); } - else if (pcnt > 1) + else if (parameters.size() > 1) { bool SkipAccessChecks = false; @@ -485,7 +485,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo else { /* No such nick/channel */ - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]); + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0].c_str()); return; } @@ -495,8 +495,8 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo std::string output_sequence; bool adding = true, state_change = false; unsigned char handler_id = 0; - int parameter_counter = 2; /* Index of first parameter */ - int parameter_count = 0; + unsigned int parameter_counter = 2; /* Index of first parameter */ + unsigned int parameter_count = 0; bool last_successful_state_change = false; /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */ @@ -559,7 +559,7 @@ void ModeParser::Process(const char* const* parameters, int pcnt, User *user, bo if (modehandlers[handler_id]->GetNumParams(adding)) { /* This mode expects a parameter, do we have any parameters left in our list to use? */ - if (parameter_counter < pcnt) + if (parameter_counter < parameters.size()) { parameter = parameters[parameter_counter++]; @@ -1127,7 +1127,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) { char moderemove[MAXBUF]; - const char* parameters[] = { user->nick, moderemove }; + std::vector parameters; if (user->IsModeSet(this->GetModeChar())) { @@ -1138,7 +1138,9 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) else { sprintf(moderemove,"-%c",this->GetModeChar()); - ServerInstance->Parser->CallHandler("MODE", parameters, 2, user); + parameters.push_back(user->nick); + parameters.push_back(moderemove); + ServerInstance->Parser->CallHandler("MODE", parameters, user); } } } @@ -1149,7 +1151,7 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) { char moderemove[MAXBUF]; - const char* parameters[] = { channel->name, moderemove }; + std::vector parameters; if (channel->IsModeSet(this->GetModeChar())) { @@ -1160,7 +1162,9 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) else { sprintf(moderemove,"-%c",this->GetModeChar()); - ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient); + parameters.push_back(channel->name); + parameters.push_back(moderemove); + ServerInstance->SendMode(parameters, ServerInstance->FakeClient); } } } -- cgit v1.2.3