X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_monitor.cpp;h=b82dbcc7d9310ac457b1de70a3d745a44060e4ec;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=af792743a0c2fecea612964716ac9601da04777d;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index af792743a..b82dbcc7d 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -79,7 +79,7 @@ class IRCv3::Monitor::Manager
 
 		void unset(Extensible* container)
 		{
-			free(unset_raw(container));
+			free(container, unset_raw(container));
 		}
 
 		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
@@ -101,7 +101,7 @@ class IRCv3::Monitor::Manager
 
 		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 
-		void free(void* item) CXX11_OVERRIDE
+		void free(Extensible* container, void* item) CXX11_OVERRIDE
 		{
 			delete static_cast<ExtData*>(item);
 		}
@@ -316,10 +316,10 @@ class CommandMonitor : public SplitCommand
 	{
 		Penalty = 2;
 		allow_empty_last_param = false;
-		syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]";
+		syntax = "C|L|S|(+|-) <nick>[,<nick>]+";
 	}
 
-	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
+	CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		char subcmd = toupper(parameters[0][0]);
 		if (subcmd == '+')
@@ -402,7 +402,7 @@ class ModuleMonitor : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("monitor");
-		cmd.maxmonitor = tag->getInt("maxentries", 30, 1);
+		cmd.maxmonitor = tag->getUInt("maxentries", 30, 1);
 	}
 
 	void OnPostConnect(User* user) CXX11_OVERRIDE