X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=ba9ac9dc7ad93ccaca5c5d5bba35231f67e8a620;hb=221934729eba613b1a845771a0a6aabf3eb6390c;hp=f90347e95c450cdf39ac5abcb6e327272bbf7e86;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index f90347e95..ba9ac9dc7 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -14,31 +14,15 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <vector>
-#include <deque>
+#include "inspircd_config.h"
+#include "hash_map.h"
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "message.h"
 #include "commands.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_kill.h"
+#include "commands/cmd_kill.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
@@ -46,7 +30,7 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern user_hash clientlist;
 
-void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	userrec *u = Find(parameters[0]);
 	char killreason[MAXBUF];
@@ -69,7 +53,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
 		{
 			// remote kill
 			WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
-			snprintf(killreason, MAXBUF,"[%s] Killed (%s (%s))", Config->ServerName, user->nick, parameters[1]);
+			snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", Config->ServerName, user->nick, parameters[1]);
 			WriteCommonExcept(u, "QUIT :%s", killreason);
 			FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
 			
@@ -86,7 +70,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
 				purge_empty_chans(u);
 			}
 
-			delete u;
+			DELETE(u);
 		}
 		else
 		{
@@ -94,7 +78,7 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
 			log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, Config->ServerName, user->dhost, user->nick, parameters[1]);
 			WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, Config->ServerName, user->dhost, user->nick, parameters[1]);
 			WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
-			snprintf(killreason,MAXBUF,"Killed (%s (%s))", user->nick, parameters[1]);
+			snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
 			kill_link(u, killreason);
 		}
 	}
@@ -103,5 +87,3 @@ void cmd_kill::Handle (char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]);
 	}
 }
-
-