Convert more by-values to const references, optimise ConfigReader a bit

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

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index e2effdcf6944549848dfb13f823866c641c914fa..43797cbeb76829d63a0bb5bb6f0e8dfc7e1990c2 100644 (file)
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -57,7 +57,6 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
@@ -77,7 +76,7 @@ void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
        c = FindChan(parameters[0]);
        if (c)
        {
-                if (((c) && (!has_channel(user,c))) && (c->binarymodes & CM_SECRET))
+                if ((c->binarymodes & CM_SECRET) && (!c->HasUser(user)))
                 {
                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
                       return;