Remove an extern, partly because it's unused, partly because it then gets shadowed...

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

diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 43797cbeb76829d63a0bb5bb6f0e8dfc7e1990c2..817c892dc5c9d2dba3a1b1b18c57311bd67288bc 100644 (file)
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -14,52 +14,13 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_names.h"
 
-extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -76,11 +37,11 @@ void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
        c = FindChan(parameters[0]);
        if (c)
        {
-                if ((c->binarymodes & CM_SECRET) && (!c->HasUser(user)))
-                {
-                      WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
-                      return;
-                }
+               if ((c->modes[CM_SECRET]) && (!c->HasUser(user)))
+               {
+                     WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, c->name);
+                     return;
+               }
                userlist(user,c);
                WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
        }
@@ -89,5 +50,3 @@ void cmd_names::Handle (char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
        }
 }
-
-