From 9d4b37035491e4481f5e0d6db4116c75f1df66c3 Mon Sep 17 00:00:00 2001
From: Nathan Woods <npwoods@mess.org>
Date: Tue, 9 May 2017 07:57:44 -0400
Subject: [PATCH] Changed 'int ignore_warnings' parameter on
 core_options::parse_ini_file() to be 'bool ignore_unknown_options'

---
 src/frontend/mame/mame.cpp     | 2 +-
 src/frontend/mame/mameopts.cpp | 2 +-
 src/frontend/mame/ui/ui.cpp    | 4 ++--
 src/lib/util/options.cpp       | 4 ++--
 src/lib/util/options.h         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp
index 211007c4a5b..cdab8e4d9c9 100644
--- a/src/frontend/mame/mame.cpp
+++ b/src/frontend/mame/mame.cpp
@@ -129,7 +129,7 @@ void mame_machine_manager::start_luaengine()
 			emu_file file(options().ini_path(), OPEN_FLAG_READ);
 			if (file.open("plugin.ini") == osd_file::error::NONE)
 			{
-				bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
+				bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
 				if (!result)
 					osd_printf_error("**Error loading plugin.ini**\n");
 			}
diff --git a/src/frontend/mame/mameopts.cpp b/src/frontend/mame/mameopts.cpp
index 8cb8cff09fa..2fc84fbeba9 100644
--- a/src/frontend/mame/mameopts.cpp
+++ b/src/frontend/mame/mameopts.cpp
@@ -681,7 +681,7 @@ bool mame_options::parse_one_ini(emu_options &options, const char *basename, int
 	// parse the file
 	osd_printf_verbose("Parsing %s.ini\n", basename);
 	std::string error;
-	bool result = options.parse_ini_file((util::core_file&)file, priority, OPTION_PRIORITY_DRIVER_INI, error);
+	bool result = options.parse_ini_file((util::core_file&)file, priority, priority < OPTION_PRIORITY_DRIVER_INI, error);
 
 	// append errors if requested
 	if (!error.empty() && error_string)
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index 552cd2a0e00..ebce7b1c3d0 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -2233,7 +2233,7 @@ void mame_ui_manager::load_ui_options()
 	emu_file file(machine().options().ini_path(), OPEN_FLAG_READ);
 	if (file.open("ui.ini") == osd_file::error::NONE)
 	{
-		bool result = options().parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
+		bool result = options().parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
 		if (!result)
 			osd_printf_error("**Error loading ui.ini**\n");
 	}
@@ -2274,7 +2274,7 @@ void mame_ui_manager::save_main_option()
 		emu_file file(machine().options().ini_path(), OPEN_FLAG_READ);
 		if (file.open(emulator_info::get_configname(), ".ini") == osd_file::error::NONE)
 		{
-			bool result = options.parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
+			bool result = options.parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
 			if (!result)
 			{
 				osd_printf_error("**Error loading %s.ini**\n", emulator_info::get_configname());
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