Merge pull request #1147 from SaberUK/insp20+gcc6

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 7e9c5fd48f6e6dbaaf586d74559308dbe91c4d75..82d311773c2b52ba0d7ce14b50140e65efe868dd 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -30,9 +30,13 @@ class ModuleNamesX : public Module
  public:
        GenericCap cap;
        ModuleNamesX() : cap(this, "multi-prefix")
+       {
+       }
+
+       void init()
        {
                Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
@@ -52,13 +56,12 @@ class ModuleNamesX : public Module
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
                 * Therefore, we just hook its as an unvalidated command therefore we
                 * can capture it even if it doesnt exist! :-)
                 */
-               if (c == "PROTOCTL")
+               if (command == "PROTOCTL")
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
@@ -106,7 +109,7 @@ class ModuleNamesX : public Module
 
                // Try to find this channel
                std::string channame = line.substr(a, b-a);
-               Channel* chan = ServerInstance->FindChan(channame.c_str());
+               Channel* chan = ServerInstance->FindChan(channame);
                if (!chan)
                        return;