Remove a few unnecessary .c_str() calls

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

diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index ea1020fbc6f798807601e97df7d199a864594bb0..0a3a994a84d6fc4584d0e76da99f67f4c2bfbde2 100644 (file)
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -36,7 +36,7 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
        /* if whowas disabled in config */
        if (this->GroupSize == 0 || this->MaxGroups == 0)
        {
-               user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),name.c_str());
+               user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", name.c_str());
                return CMD_FAILURE;
        }
 
@@ -44,7 +44,7 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 
        if (i == whowas.end())
        {
-               user->WriteNumeric(406, "%s %s :There was no such nickname",user->nick.c_str(),parameters[0].c_str());
+               user->WriteNumeric(ERR_WASNOSUCHNICK, "%s :There was no such nickname", parameters[0].c_str());
        }
        else
        {
@@ -55,25 +55,25 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
                        {
                                WhoWasGroup* u = *ux;
 
-                               user->WriteNumeric(314, "%s %s %s %s * :%s",user->nick.c_str(),parameters[0].c_str(),
+                               user->WriteNumeric(RPL_WHOWASUSER, "%s %s %s * :%s", parameters[0].c_str(),
                                        u->ident.c_str(),u->dhost.c_str(),u->gecos.c_str());
 
                                if (user->HasPrivPermission("users/auspex"))
-                                       user->WriteNumeric(379, "%s %s :was connecting from *@%s",
-                                               user->nick.c_str(), parameters[0].c_str(), u->host.c_str());
+                                       user->WriteNumeric(RPL_WHOWASIP, "%s :was connecting from *@%s",
+                                               parameters[0].c_str(), u->host.c_str());
 
-                               std::string signon = ServerInstance->TimeString(u->signon);
+                               std::string signon = InspIRCd::TimeString(u->signon);
                                bool hide_server = (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"));
-                               user->WriteNumeric(312, "%s %s %s :%s",user->nick.c_str(), parameters[0].c_str(), (hide_server ? ServerInstance->Config->HideWhoisServer.c_str() : u->server.c_str()), signon.c_str());
+                               user->WriteNumeric(RPL_WHOISSERVER, "%s %s :%s", parameters[0].c_str(), (hide_server ? ServerInstance->Config->HideWhoisServer.c_str() : u->server.c_str()), signon.c_str());
                        }
                }
                else
                {
-                       user->WriteNumeric(406, "%s %s :There was no such nickname",user->nick.c_str(),parameters[0].c_str());
+                       user->WriteNumeric(ERR_WASNOSUCHNICK, "%s :There was no such nickname", parameters[0].c_str());
                }
        }
 
-       user->WriteNumeric(369, "%s %s :End of WHOWAS",user->nick.c_str(),parameters[0].c_str());
+       user->WriteNumeric(RPL_ENDOFWHOWAS, "%s :End of WHOWAS", parameters[0].c_str());
        return CMD_SUCCESS;
 }
 
@@ -215,7 +215,7 @@ CommandWhowas::~CommandWhowas()
 }
 
 WhoWasGroup::WhoWasGroup(User* user) : host(user->host), dhost(user->dhost), ident(user->ident),
-       server(user->server), gecos(user->fullname), signon(user->signon)
+       server(user->server->GetName()), gecos(user->fullname), signon(user->signon)
 {
 }
 
@@ -228,11 +228,6 @@ class ModuleWhoWas : public Module
        {
        }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        void OnGarbageCollect()
        {
                // Remove all entries older than MaxKeep
@@ -247,7 +242,7 @@ class ModuleWhoWas : public Module
        ModResult OnStats(char symbol, User* user, string_list &results)
        {
                if (symbol == 'z')
-                       results.push_back(ServerInstance->Config->ServerName+" 249 "+user->nick+" :"+cmd.GetStats());
+                       results.push_back("249 "+user->nick+" :"+cmd.GetStats());
 
                return MOD_RES_PASSTHRU;
        }