diff options
| author | 2017-05-09 07:57:44 -0400 | |
|---|---|---|
| committer | 2017-05-10 09:53:15 +1000 | |
| commit | 9d4b37035491e4481f5e0d6db4116c75f1df66c3 (patch) | |
| tree | eba51238a1fb83cc1c216bf262ee5534a28b371c /src/lib/util | |
| parent | 3f3b6bc4cc9c2237d9db39cb174e9b73e5fc0e32 (diff) | |
Changed 'int ignore_warnings' parameter on core_options::parse_ini_file() to be 'bool ignore_unknown_options'
Diffstat (limited to 'src/lib/util')
| -rw-r--r-- | src/lib/util/options.cpp | 4 | ||||
| -rw-r--r-- | src/lib/util/options.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index 8500eda327d..af172d7a94b 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -424,7 +424,7 @@ bool core_options::parse_command_line(std::vector<std::string> &args, int priori // an INI file //------------------------------------------------- -bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ignore_priority, std::string &error_string) +bool core_options::parse_ini_file(util::core_file &inifile, int priority, bool ignore_unknown_options, std::string &error_string) { // loop over lines in the file char buffer[4096]; @@ -472,7 +472,7 @@ bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ig auto curentry = m_entrymap.find(optionname); if (curentry == m_entrymap.end()) { - if (priority >= ignore_priority) + if (!ignore_unknown_options) error_string.append(string_format("Warning: unknown option in INI: %s\n", optionname)); continue; } diff --git a/src/lib/util/options.h b/src/lib/util/options.h index edf7f8600c8..a2959a24a8f 100644 --- a/src/lib/util/options.h +++ b/src/lib/util/options.h @@ -146,7 +146,7 @@ public: // parsing/input bool parse_command_line(std::vector<std::string> &args, int priority, std::string &error_string); - bool parse_ini_file(util::core_file &inifile, int priority, int ignore_priority, std::string &error_string); + bool parse_ini_file(util::core_file &inifile, int priority, bool ignore_unknown_options, std::string &error_string); bool pluck_from_command_line(std::vector<std::string> &args, const std::string &name, std::string &result); // reverting |
