Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index a2cc3343a0d82cfc97713ed7bc681db1dd43a4d8..d48d1a10c46a3dcbd1569f62d33195157f41e417 100644 (file)
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -18,8 +18,6 @@
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-
 #include "commands/cmd_whois.h"
 
 const char* Spacify(char* n)
@@ -93,11 +91,18 @@ void do_whois(InspIRCd* ServerInstance, userrec* user, userrec* dest,unsigned lo
        }
 }
 
-void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_whois(Instance);
+}
+
+CmdResult cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
 {
        userrec *dest;
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
-               return;
+               return CMD_SUCCESS;
 
        dest = ServerInstance->FindNick(parameters[0]);
        if (dest)
@@ -109,6 +114,9 @@ void cmd_whois::Handle (const char** parameters, int pcnt, userrec *user)
                /* no such nick/channel */
                user->WriteServ("401 %s %s :No such nick/channel",user->nick, *parameters[0] ? parameters[0] : "*");
                user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               return CMD_FAILURE;
        }
+
+       return CMD_SUCCESS;
 }