Add ConfigTag::getUInt for reading unsigned config values.

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index eba86f94b694a5a31b1e8c77bf40d226e951f7fd..b79e126a3e5658b0f8cb03f0eb295b7d585eb36f 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -86,9 +86,10 @@ public:
                                size_t upper = 0;
                                for (std::string::const_iterator iter = text_begin; iter != text_end; ++iter)
                                {
-                                       if (uppercase.test(*iter))
+                                       unsigned char chr = static_cast<unsigned char>(*iter);
+                                       if (uppercase.test(chr))
                                                upper += 1;
-                                       else if (!lowercase.test(*iter))
+                                       else if (!lowercase.test(chr))
                                                length -= 1;
                                }
 
@@ -108,18 +109,18 @@ public:
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
-               percent = tag->getInt("percent", 100, 1, 100);
-               minlen = tag->getInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
+               percent = tag->getUInt("percent", 100, 1, 100);
+               minlen = tag->getUInt("minlen", 1, 1, ServerInstance->Config->Limits.MaxLine);
 
                lowercase.reset();
                const std::string lower = tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz");
                for (std::string::const_iterator iter = lower.begin(); iter != lower.end(); ++iter)
-                       lowercase.set(*iter);
+                       lowercase.set(static_cast<unsigned char>(*iter));
 
                uppercase.reset();
                const std::string upper = tag->getString("uppercase", tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
                for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter)
-                       uppercase.set(*iter);
+                       uppercase.set(static_cast<unsigned char>(*iter));
        }
 
        Version GetVersion() CXX11_OVERRIDE