m_dccallow Add config option to control max entries on a list

[user/henk/code/inspircd.git] / src / configparser.cpp

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 7d9eab651a88f81719e9f4b216cc8db090652301..94192a71bb9166c2e8bda7124793f96c260fbe91 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -390,8 +390,17 @@ bool ParseStack::ParseExec(const std::string& name, int flags, const std::string
 
 bool ConfigTag::readString(const std::string& key, std::string& value, bool allow_lf)
 {
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-pragmas"
+# pragma clang diagnostic ignored "-Wundefined-bool-conversion"
+#endif
+       // TODO: this is undefined behaviour but changing the API is too risky for 2.0.
        if (!this)
                return false;
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
        for(std::vector<KeyVal>::iterator j = items.begin(); j != items.end(); ++j)
        {
                if(j->first != key)
@@ -472,10 +481,10 @@ std::string ConfigTag::getTagLocation()
        return src_name + ":" + ConvToStr(src_line);
 }
 
-ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*&items)
+ConfigTag* ConfigTag::create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items)
 {
        ConfigTag* rv = new ConfigTag(Tag, file, line);
-       items = &rv->items;
+       Items = &rv->items;
        return rv;
 }