Remove a few unnecessary .c_str() calls

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

diff --git a/src/commands/cmd_names.cpp b/src/commands/cmd_names.cpp
index 1f0de91f1353bd8713e52c1866697e02e3d6db81..206b1ccaaba6f929d91b001c3a25d2848e9e9183 100644 (file)
--- a/src/commands/cmd_names.cpp
+++ b/src/commands/cmd_names.cpp
@@ -27,10 +27,18 @@
  */
 class CommandNames : public Command
 {
+       ChanModeReference secretmode;
+
  public:
        /** Constructor for names.
         */
-       CommandNames ( Module* parent) : Command(parent,"NAMES",0,0) { syntax = "{<channel>{,<channel>}}"; }
+       CommandNames(Module* parent)
+               : Command(parent, "NAMES", 0, 0)
+               , secretmode(parent, "secret")
+       {
+               syntax = "{<channel>{,<channel>}}";
+       }
+
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -48,7 +56,7 @@ CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User
 
        if (!parameters.size())
        {
-               user->WriteNumeric(366, "%s * :End of /NAMES list.",user->nick.c_str());
+               user->WriteNumeric(RPL_ENDOFNAMES, "* :End of /NAMES list.");
                return CMD_SUCCESS;
        }
 
@@ -58,16 +66,16 @@ CmdResult CommandNames::Handle (const std::vector<std::string>& parameters, User
        c = ServerInstance->FindChan(parameters[0]);
        if (c)
        {
-               if ((c->IsModeSet('s')) && (!c->HasUser(user)))
+               if ((c->IsModeSet(secretmode)) && (!c->HasUser(user)))
                {
-                     user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), c->name.c_str());
+                     user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c->name.c_str());
                      return CMD_FAILURE;
                }
                c->UserList(user);
        }
        else
        {
-               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
+               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
        }
 
        return CMD_SUCCESS;