Remove a few unnecessary .c_str() calls

[user/henk/code/inspircd.git] / src / commands / cmd_user.cpp

diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp
index 57aecc2f7a9ec917ab7bf7d11942564082560574..932e3a9b85ad49fb68a619496733c8dea1c6a7e9 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -45,13 +45,13 @@ CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, L
        /* A user may only send the USER command once */
        if (!(user->registered & REG_USER))
        {
-               if (!ServerInstance->IsIdent(parameters[0].c_str()))
+               if (!ServerInstance->IsIdent(parameters[0]))
                {
                        /*
                         * RFC says we must use this numeric, so we do. Let's make it a little more nub friendly though. :)
                         *  -- Craig, and then w00t.
                         */
-                       user->WriteNumeric(461, "%s USER :Your username is not valid",user->nick.c_str());
+                       user->WriteNumeric(ERR_NEEDMOREPARAMS, "USER :Your username is not valid");
                        return CMD_FAILURE;
                }
                else
@@ -61,14 +61,14 @@ CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, L
                         * ~ character, and +1 for null termination, therefore we can safely use up to
                         * IDENTMAX here.
                         */
-                       user->ChangeIdent(parameters[0].c_str());
-                       user->fullname.assign(parameters[3].empty() ? std::string("No info") : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
+                       user->ChangeIdent(parameters[0]);
+                       user->fullname.assign(parameters[3].empty() ? "No info" : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
        }
        else
        {
-               user->WriteNumeric(462, "%s :You may not reregister", user->nick.c_str());
+               user->WriteNumeric(ERR_ALREADYREGISTERED, ":You may not reregister");
                return CMD_FAILURE;
        }