DOH! Fix my muppetry of a segfault, and fix some warnings

[user/henk/code/inspircd.git] / src / modules / m_uninvite.cpp

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index c07c9817e58541f121ed45e0921a5e251a07760d..9940d46d8818315b28af23d45526710b23492f4d 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,7 +27,7 @@ class CommandUninvite : public Command
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
@@ -36,11 +36,11 @@ class CommandUninvite : public Command
                {       
                        if (!c)
                        {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[1]);
                        }
                        else
                        {
-                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]);
                        }
                                
                        return CMD_FAILURE;
@@ -50,7 +50,7 @@ class CommandUninvite : public Command
                {
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
-                               user->WriteServ("482 %s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
+                               user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
                                                ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
                                return CMD_FAILURE;
                        }
@@ -60,18 +60,18 @@ class CommandUninvite : public Command
 
                if (!u->IsInvited(xname))
                {
-                       user->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
+                       user->WriteNumeric(491, "%s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
                        return CMD_FAILURE;
                }
                if (!c->HasUser(user))
                {
-                       user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
+                       user->WriteNumeric(492, "%s %s :You're not on that channel!",user->nick, c->name);
                        return CMD_FAILURE;
                }
 
                u->RemoveInvite(xname);
-               user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
-               u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
+               user->WriteNumeric(494, "%s %s %s :Uninvited",user->nick,c->name,u->nick);
+               u->WriteNumeric(493, "%s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
                c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
 
                return CMD_SUCCESS;
@@ -98,7 +98,7 @@ class ModuleUninvite : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };