Fix an shadowing warning in the spanningtree module.

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

diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index 61c50ec0cf11b4bfe6e9c6c78842ab8246c8ca68..831aa908db92b0bbb3a797c40d55d085bed96097 100644 (file)
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -28,9 +28,9 @@ class CustomPrefixMode : public PrefixMode
                : PrefixMode(parent, Name, Letter, 0, Prefix)
                , tag(Tag)
        {
-               long rank = tag->getInt("rank", 0, 0, UINT_MAX);
-               long setrank = tag->getInt("ranktoset", prefixrank, rank, UINT_MAX);
-               long unsetrank = tag->getInt("ranktounset", setrank, setrank, UINT_MAX);
+               unsigned long rank = tag->getUInt("rank", 0, 0, UINT_MAX);
+               unsigned long setrank = tag->getUInt("ranktoset", prefixrank, rank, UINT_MAX);
+               unsigned long unsetrank = tag->getUInt("ranktounset", setrank, setrank, UINT_MAX);
                bool depriv = tag->getBool("depriv", true);
                this->Update(rank, setrank, unsetrank, depriv);
 
@@ -58,15 +58,15 @@ class ModuleCustomPrefix : public Module
                        {
                                ModeHandler* mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL);
                                if (!mh)
-                                       throw ModuleException("<customprefix:change> specified for a non-existent mode at " + tag->getTagLocation());
+                                       throw ModuleException("<customprefix:change> specified for a nonexistent mode at " + tag->getTagLocation());
 
                                PrefixMode* pm = mh->IsPrefixMode();
                                if (!pm)
                                        throw ModuleException("<customprefix:change> specified for a non-prefix mode at " + tag->getTagLocation());
 
-                               long rank = tag->getInt("rank", pm->GetPrefixRank(), 0, UINT_MAX);
-                               long setrank = tag->getInt("ranktoset", pm->GetLevelRequired(true), rank, UINT_MAX);
-                               long unsetrank = tag->getInt("ranktounset", pm->GetLevelRequired(false), setrank, UINT_MAX);
+                               unsigned long rank = tag->getUInt("rank", pm->GetPrefixRank(), 0, UINT_MAX);
+                               unsigned long setrank = tag->getUInt("ranktoset", pm->GetLevelRequired(true), rank, UINT_MAX);
+                               unsigned long unsetrank = tag->getUInt("ranktounset", pm->GetLevelRequired(false), setrank, UINT_MAX);
                                bool depriv = tag->getBool("depriv", pm->CanSelfRemove());
                                pm->Update(rank, setrank, unsetrank, depriv);
 
@@ -86,6 +86,7 @@ class ModuleCustomPrefix : public Module
                        try
                        {
                                CustomPrefixMode* mh = new CustomPrefixMode(this, name, letter[0], prefix[0], tag);
+                               modes.push_back(mh);
                                ServerInstance->Modules->AddService(*mh);
                        }
                        catch (ModuleException& e)