Fixed these ModuleManager::Attach calls once and for all..

22 files changed, 22 insertions, 22 deletions

diff --git a/modules/core/bs_main.cpp b/modules/core/bs_main.cpp
index ff1e1f0d4..515b99ae0 100644
--- a/modules/core/bs_main.cpp
+++ b/modules/core/bs_main.cpp
@@ -27,7 +27,7 @@ class BotServCore : public Module
 
 		Implementation i[] = { I_OnPrivmsg, I_OnPreCommand, I_OnJoinChannel, I_OnLeaveChannel,
 					I_OnPreHelp, I_OnPostHelp, I_OnChannelModeSet };
-		ModuleManager::Attach(i, this, 7);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 	}
 
diff --git a/modules/core/cs_main.cpp b/modules/core/cs_main.cpp
index 0ee132fe7..7093ab3ca 100644
--- a/modules/core/cs_main.cpp
+++ b/modules/core/cs_main.cpp
@@ -25,7 +25,7 @@ class ChanServCore : public Module
 			throw ModuleException("No bot named " + Config->ChanServ);
 
 		Implementation i[] = { I_OnBotPrivmsg, I_OnDelCore, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message)
diff --git a/modules/core/db_mysql.cpp b/modules/core/db_mysql.cpp
index 3da43f6a7..d19485e09 100644
--- a/modules/core/db_mysql.cpp
+++ b/modules/core/db_mysql.cpp
@@ -132,7 +132,7 @@ class DBMySQL : public Module
 		Implementation i[] = {
 			I_OnLoadDatabase, I_OnServerConnect
 		};
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandsqlsync);
 
diff --git a/modules/core/db_mysql_live.cpp b/modules/core/db_mysql_live.cpp
index a9abd2868..ecfdc70d1 100644
--- a/modules/core/db_mysql_live.cpp
+++ b/modules/core/db_mysql_live.cpp
@@ -162,7 +162,7 @@ class MySQLLiveModule : public Module
 		Module(modname, creator, DATABASE), SQL("mysql/main"), ACS("asynch_commands")
 	{
 		Implementation i[] = { I_OnFindChan, I_OnFindNick, I_OnFindCore, I_OnShutdown };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnShutdown()
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp
index d5ccfbfb8..da0f46053 100644
--- a/modules/core/db_plain.cpp
+++ b/modules/core/db_plain.cpp
@@ -360,7 +360,7 @@ class DBPlain : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnDatabaseRead, I_OnLoadDatabase, I_OnDatabaseReadMetadata, I_OnSaveDatabase, I_OnModuleLoad };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 
diff --git a/modules/core/enc_md5.cpp b/modules/core/enc_md5.cpp
index 68c13b8e6..109f31dfc 100644
--- a/modules/core/enc_md5.cpp
+++ b/modules/core/enc_md5.cpp
@@ -320,7 +320,7 @@ class EMD5 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)
diff --git a/modules/core/enc_none.cpp b/modules/core/enc_none.cpp
index 9f1637dcd..180b431c2 100644
--- a/modules/core/enc_none.cpp
+++ b/modules/core/enc_none.cpp
@@ -17,7 +17,7 @@ class ENone : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnDecrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)
diff --git a/modules/core/enc_old.cpp b/modules/core/enc_old.cpp
index 689625fe1..e68887c49 100644
--- a/modules/core/enc_old.cpp
+++ b/modules/core/enc_old.cpp
@@ -325,7 +325,7 @@ class EOld : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)
diff --git a/modules/core/enc_sha1.cpp b/modules/core/enc_sha1.cpp
index 165454737..4fe321bdc 100644
--- a/modules/core/enc_sha1.cpp
+++ b/modules/core/enc_sha1.cpp
@@ -173,7 +173,7 @@ class ESHA1 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)
diff --git a/modules/core/enc_sha256.cpp b/modules/core/enc_sha256.cpp
index 8f11ef933..3034f3731 100644
--- a/modules/core/enc_sha256.cpp
+++ b/modules/core/enc_sha256.cpp
@@ -252,7 +252,7 @@ class ESHA256 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		use_iv = false;
 	}
diff --git a/modules/core/gl_main.cpp b/modules/core/gl_main.cpp
index e7fdc95f8..c7ccf9209 100644
--- a/modules/core/gl_main.cpp
+++ b/modules/core/gl_main.cpp
@@ -60,7 +60,7 @@ class GlobalCore : public Module
 		ModuleManager::RegisterService(&this->myglobalservice);
 
 		Implementation i[] = { I_OnRestart, I_OnShutdown, I_OnNewServer, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnRestart()
diff --git a/modules/core/hs_main.cpp b/modules/core/hs_main.cpp
index c88f98a50..a6cc6bbb7 100644
--- a/modules/core/hs_main.cpp
+++ b/modules/core/hs_main.cpp
@@ -28,7 +28,7 @@ class HostServCore : public Module
 			throw ModuleException("No bot named " + Config->HostServ);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnNickUpdate, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnNickIdentify(User *u)
diff --git a/modules/core/ms_main.cpp b/modules/core/ms_main.cpp
index cb3a21b59..4a4531a3f 100644
--- a/modules/core/ms_main.cpp
+++ b/modules/core/ms_main.cpp
@@ -167,7 +167,7 @@ class MemoServCore : public Module
 			throw ModuleException("No bot named " + Config->MemoServ);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnJoinChannel, I_OnUserAway, I_OnNickUpdate, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->mymemoserv);
 	}
diff --git a/modules/core/ns_ajoin.cpp b/modules/core/ns_ajoin.cpp
index 2838352dd..056b22e08 100644
--- a/modules/core/ns_ajoin.cpp
+++ b/modules/core/ns_ajoin.cpp
@@ -116,7 +116,7 @@ class NSAJoin : public Module
 		ModuleManager::RegisterService(&commandnsajoin);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnNickIdentify(User *u)
diff --git a/modules/core/ns_cert.cpp b/modules/core/ns_cert.cpp
index c351dbd43..fbd75d597 100644
--- a/modules/core/ns_cert.cpp
+++ b/modules/core/ns_cert.cpp
@@ -211,7 +211,7 @@ class NSCert : public Module
 			throw ModuleException("Your IRCd does not support ssl client certificates");
 
 		Implementation i[] = { I_OnUserNickChange, I_OnFingerprint };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandnscert);
 	}
diff --git a/modules/core/ns_main.cpp b/modules/core/ns_main.cpp
index e01d82391..57323d0a5 100644
--- a/modules/core/ns_main.cpp
+++ b/modules/core/ns_main.cpp
@@ -147,7 +147,7 @@ class NickServCore : public Module
 
 		Implementation i[] = { I_OnDelNick, I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickIdentify, I_OnNickGroup,
 		I_OnNickUpdate, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 9);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->mynickserv);
 	}
diff --git a/modules/core/os_forbid.cpp b/modules/core/os_forbid.cpp
index dabe8ee43..8c788006f 100644
--- a/modules/core/os_forbid.cpp
+++ b/modules/core/os_forbid.cpp
@@ -207,7 +207,7 @@ class OSForbid : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnUserConnect, I_OnUserNickChange, I_OnJoinChannel, I_OnPreCommand, I_OnDatabaseWrite, I_OnDatabaseRead };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 		
 		ModuleManager::RegisterService(&this->forbidService);
 
diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp
index 8c3f90818..0713f928f 100644
--- a/modules/core/os_ignore.cpp
+++ b/modules/core/os_ignore.cpp
@@ -294,7 +294,7 @@ class OSIgnore : public Module
 		ModuleManager::RegisterService(&commandosignore);
 
 		Implementation i[] = { I_OnDatabaseRead, I_OnDatabaseWrite, I_OnBotPrivmsg };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->osignoreservice);
 	}
diff --git a/modules/core/os_main.cpp b/modules/core/os_main.cpp
index bfb7ddfe6..b555b9ede 100644
--- a/modules/core/os_main.cpp
+++ b/modules/core/os_main.cpp
@@ -293,7 +293,7 @@ class OperServCore : public Module
 			throw ModuleException("No bot named " + Config->OperServ);
 
 		Implementation i[] = { I_OnBotPrivmsg, I_OnServerQuit, I_OnUserModeSet, I_OnUserModeUnset, I_OnUserConnect, I_OnUserNickChange, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 7);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&sglines);
 		ModuleManager::RegisterService(&szlines);
diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp
index df91e4c66..6eac9db1f 100644
--- a/modules/core/os_news.cpp
+++ b/modules/core/os_news.cpp
@@ -381,7 +381,7 @@ class OSNews : public Module
 		ModuleManager::RegisterService(&commandosrandomnews);
 
 		Implementation i[] = { I_OnUserModeSet, I_OnUserConnect, I_OnDatabaseRead, I_OnDatabaseWrite };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->newsservice);
 	}
diff --git a/modules/core/os_oper.cpp b/modules/core/os_oper.cpp
index e1a09dcb8..8352fb89f 100644
--- a/modules/core/os_oper.cpp
+++ b/modules/core/os_oper.cpp
@@ -174,7 +174,7 @@ class OSOper : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnDatabaseWrite, I_OnDatabaseRead };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandosoper);
 	}
diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp
index c53168f06..d39896608 100644
--- a/modules/core/os_session.cpp
+++ b/modules/core/os_session.cpp
@@ -725,7 +725,7 @@ class OSSession : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnUserConnect, I_OnUserLogoff };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandossession);
 		ModuleManager::RegisterService(&commandosexception);