X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=a97fe8d3f717d63ee350778b6bf6d800584a9868;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=83958ee2dae6d0c15cd6899d84dade68a0b5e6ac;hpb=55e822ce85f88b5a8919cd9cc305462dd03c99a3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 83958ee2d..a97fe8d3f 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -21,7 +21,7 @@ char* RandString(unsigned int length)
 	
 	out[length] = '\0';
 	
-	delete tmp;
+	DELETE(tmp);
 	
 	return (char*)out;
 }
@@ -42,7 +42,7 @@ class ModuleWaitPong : public Module
 		OnRehash("");
 	}
 	
-	virtual void OnRehash(std::string param)
+	virtual void OnRehash(const std::string &param)
 	{
 		Conf = new ConfigReader;
 		
@@ -56,7 +56,7 @@ class ModuleWaitPong : public Module
 		if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
 			killonbadreply = true;
 				
-		delete Conf;
+		DELETE(Conf);
 	}
 
 	void Implements(char* List)
@@ -76,17 +76,18 @@ class ModuleWaitPong : public Module
 		user->Extend("waitpong_pingstr", pingrpl);
 	}
 	
-	virtual int OnPreCommand(std::string command, char** parameters, int pcnt,	userrec* user,	bool validated)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated)
 	{
 		if(command == "PONG")
 		{
-			char* pingrpl = user->GetExt("waitpong_pingstr");
+			char* pingrpl;
+			user->GetExt("waitpong_pingstr", pingrpl);
 			
 			if(pingrpl)
 			{
 				if(strcmp(pingrpl, parameters[0]) == 0)
 				{
-					delete pingrpl;
+					DELETE(pingrpl);
 					user->Shrink("waitpong_pingstr");
 					return 1;
 				}
@@ -104,16 +105,18 @@ class ModuleWaitPong : public Module
 
 	virtual bool OnCheckReady(userrec* user)
 	{
-		return (!user->GetExt("waitpong_pingstr"));
+		char* pingrpl;
+		return (!user->GetExt("waitpong_pingstr", pingrpl));
 	}
 	
 	virtual void OnUserDisconnect(userrec* user)
 	{
-		char* pingrpl = user->GetExt("waitpong_pingstr");
+		char* pingrpl;
+		user->GetExt("waitpong_pingstr", pingrpl);
 
 		if(pingrpl)
 		{
-			delete pingrpl;
+			DELETE(pingrpl);
 			user->Shrink("waitpong_pingstr");
 		}
 	}
@@ -123,11 +126,12 @@ class ModuleWaitPong : public Module
 		if(target_type == TYPE_USER)
 		{
 			userrec* user = (userrec*)item;
-			char* pingrpl = user->GetExt("waitpong_pingstr");
+			char* pingrpl;
+			user->GetExt("waitpong_pingstr", pingrpl);
 			
 			if(pingrpl)
 			{
-				delete pingrpl;
+				DELETE(pingrpl);
 				user->Shrink("waitpong_pingstr");
 			} 
 		}