m_operjoin Remove duplicated code

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

diff --git a/src/configparser.cpp b/src/configparser.cpp
index d3723d35036a790d4d360babb6611d3f469e081c..92f05edd40d33fbf630e769d7bc43dc688bfa61c 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -300,7 +300,7 @@ void ParseStack::DoInclude(ConfigTag* tag, int flags)
                        flags |= FLAG_NO_INC;
                if (tag->getBool("noexec", false))
                        flags |= FLAG_NO_EXEC;
-               if (!ParseFile(name, flags, mandatorytag))
+               if (!ParseFile(ServerInstance->Config->Paths.PrependConfig(name), flags, mandatorytag))
                        throw CoreException("Included");
        }
        else if (tag->readString("executable", name))
@@ -344,13 +344,12 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
        }
 }
 
-bool ParseStack::ParseFile(const std::string& name, int flags, const std::string& mandatory_tag)
+bool ParseStack::ParseFile(const std::string& path, int flags, const std::string& mandatory_tag)
 {
-       std::string path = ServerInstance->Config->Paths.PrependConfig(name);
        ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Reading file %s", path.c_str());
        for (unsigned int t = 0; t < reading.size(); t++)
        {
-               if (std::string(name) == reading[t])
+               if (path == reading[t])
                {
                        throw CoreException("File " + path + " is included recursively (looped inclusion)");
                }
@@ -460,13 +459,13 @@ void ConfigTag::CheckRange(const std::string& key, long& res, long def, long min
        }
 }
 
-time_t ConfigTag::getDuration(const std::string& key, long def, long min, long max)
+long ConfigTag::getDuration(const std::string& key, long def, long min, long max)
 {
        std::string duration;
        if (!readString(key, duration))
                return def;
 
-       time_t ret = InspIRCd::Duration(duration);
+       long ret = InspIRCd::Duration(duration);
        CheckRange(key, ret, def, min, max);
        return ret;
 }
@@ -500,10 +499,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;
 }