From 4a77f472fd5bad95f1e4e26835317533d988ea15 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 9 Jun 2014 17:13:31 +0200 Subject: Use std::find() in ParseStack::ParseFile() --- src/configparser.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/configparser.cpp') diff --git a/src/configparser.cpp b/src/configparser.cpp index 51b248133..60770d16d 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -367,13 +367,8 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int bool ParseStack::ParseFile(const std::string& path, int flags, const std::string& mandatory_tag, bool isexec) { ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Reading (isexec=%d) %s", isexec, path.c_str()); - for (unsigned int t = 0; t < reading.size(); t++) - { - if (path == reading[t]) - { - throw CoreException((isexec ? "Executable " : "File ") + path + " is included recursively (looped inclusion)"); - } - } + if (std::find(reading.begin(), reading.end(), path) != reading.end()) + throw CoreException((isexec ? "Executable " : "File ") + path + " is included recursively (looped inclusion)"); /* It's not already included, add it to the list of files we've loaded */ -- cgit v1.3.1-10-gc9f91