Change the function name because gcc is dumb :/

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

diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index 1a323edd4f1a414faa78d3bd3dfdbb867f182579..2758f6b85e653df48b5374c3f4413df7d94a923c 100644 (file)
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -15,7 +15,7 @@
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-static char *get_first_visible_channel(User *u)
+static const char *get_first_visible_channel(User *u)
 {
        UCListIter i = u->chans.begin();
        if (i != u->chans.end())
@@ -134,13 +134,13 @@ bool CommandWho::CanView(Channel* chan, User* user)
 
 void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
 {
-       std::string lcn = get_first_visible_channel(u);
-       Channel* chlast = ServerInstance->FindChan(lcn);
-
        /* Not visible to this user */
        if (u->Visibility && !u->Visibility->VisibleTo(user))
                return;
 
+       std::string lcn = get_first_visible_channel(u);
+       Channel* chlast = ServerInstance->FindChan(lcn);
+
        std::string wholine =   initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
                                ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
                                " " + u->nick + " ";
@@ -165,7 +165,7 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch
        whoresults.push_back(wholine);
 }
 
-CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandWho::Handle (const char* const* parameters, int pcnt, User *user)
 {
        /*
         * XXX - RFC says:
@@ -298,7 +298,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                if (opt_viewopersonly)
                {
                        /* Showing only opers */
-                       for (std::list<User*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
+                       for (std::list<User*>::iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); i++)
                        {
                                User* oper = *i;
 
@@ -316,7 +316,7 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
                }
                else
                {
-                       for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+                       for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
                        {
                                if (whomatch(i->second, matchtext))
                                {
@@ -336,13 +336,13 @@ CmdResult CommandWho::Handle (const char** parameters, int pcnt, User *user)
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);
-               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
                return CMD_SUCCESS;
        }
        else
        {
                /* BZZT! Too many results. */
-               user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]);
+               user->WriteNumeric(315, "%s %s :Too many results",user->nick, parameters[0]);
                return CMD_FAILURE;
        }
 }