X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=3d2394fb1a8e3f3f34279bab308ce187b893be77;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=c3c7f076656b2b98eb9cf30a6708eab8db045a62;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index c3c7f0766..3d2394fb1 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -120,7 +120,7 @@ struct CallerIDExtInfo : public ExtensionItem
 
 			if (!targ)
 			{
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
 				continue; // shouldn't happen, but oh well.
 			}
 
@@ -128,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 			if (it2 != targ->wholistsme.end())
 				targ->wholistsme.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
 	}
@@ -302,7 +302,7 @@ public:
 		if (!dat2)
 		{
 			// How the fuck is this possible.
-			ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
 			return false;
 		}
 
@@ -311,7 +311,7 @@ public:
 			// Found me!
 			dat2->wholistsme.erase(it);
 		else
-			ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
 
 
 		user->WriteNotice(whotoremove->nick + " is no longer on your accept list");
@@ -350,7 +350,7 @@ class ModuleCallerID : public Module
 			if (it2 != dat->accepting.end())
 				dat->accepting.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
 		}
 
 		userdata->wholistsme.clear();
@@ -368,9 +368,6 @@ public:
 		ServerInstance->Modules->AddService(myumode);
 		ServerInstance->Modules->AddService(cmd);
 		ServerInstance->Modules->AddService(cmd.extInfo);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion() CXX11_OVERRIDE