X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_quit.cpp;h=feaab0fe4b413f342ec5058c2199ed747ae3b48a;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=d8447c1de665c8379bfffcb62b16d17afbe168ee;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp index d8447c1de..feaab0fe4 100644 --- a/src/cmd_quit.cpp +++ b/src/cmd_quit.cpp @@ -35,20 +35,15 @@ #include "socketengine.h" #include "commands/cmd_quit.h" -extern InspIRCd* ServerInstance; extern InspIRCd* ServerInstance; extern int MODCOUNT; extern ModuleList modules; extern FactoryList factory; extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) { - user_hash::iterator iter = clientlist.find(user->nick); + user_hash::iterator iter = ServerInstance->clientlist.find(user->nick); char reason[MAXBUF]; if (user->registered == REG_ALL) @@ -95,23 +90,23 @@ void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) if (user->fd > -1) { ServerInstance->SE->DelFd(user->fd); - if (find(local_users.begin(),local_users.end(),user) != local_users.end()) + if (find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user) != ServerInstance->local_users.end()) { log(DEBUG,"Delete local user"); - local_users.erase(find(local_users.begin(),local_users.end(),user)); + ServerInstance->local_users.erase(find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user)); } user->CloseSocket(); } - if (iter != clientlist.end()) + if (iter != ServerInstance->clientlist.end()) { - clientlist.erase(iter); + ServerInstance->clientlist.erase(iter); } if (user->registered == REG_ALL) { purge_empty_chans(user); } if (user->fd > -1) - fd_ref_table[user->fd] = NULL; + ServerInstance->fd_ref_table[user->fd] = NULL; DELETE(user); }