Dynamically determine the size of the eventlist[] passed to Attach()

[user/henk/code/inspircd.git] / src / modules / m_callerid.cpp

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index f24c38b653acbfa074eee188a393497e84dd25e8..6ed1f957a84dcc2732c3432582d8798ac45d41c3 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -144,7 +144,7 @@ public:
        {
                if (index != 0)
                        return;
-               std::string out = "";
+               std::string out;
                irc::commasepstream nicks(parameter);
                std::string tok;
                while (nicks.GetToken(tok))
@@ -338,7 +338,7 @@ public:
                ServerInstance->Modules->AddService(cmd.extInfo);
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleCallerID()
@@ -412,11 +412,11 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               cmd.maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
-               operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
-               tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);
-               notify_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
+               cmd.maxaccepts = tag->getInt("maxaccepts", 16);
+               operoverride = tag->getBool("operoverride");
+               tracknick = tag->getBool("tracknick");
+               notify_cooldown = tag->getInt("cooldown", 60);
        }
 };