summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2011-01-21 09:17:35 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2011-01-21 09:17:35 +0000
commitc25886cea334b57e0329537db6b025138b378df5 (patch)
treeffa9107b10552e8c03a0fa8d09f260bbb0dfb5bb
parent1d78049857602b068ad731f66f3fbeb5822c267a (diff)
Ignore warnings for non existing options in previous level of ini files (parent for example) (no whatsnew)
-rw-r--r--src/emu/mame.c2
-rw-r--r--src/lib/util/options.c4
-rw-r--r--src/lib/util/options.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/mame.c b/src/emu/mame.c
index aaf773dfcaf..58e1b6c6575 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -588,7 +588,7 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
/* parse the file and close it */
mame_printf_verbose("Parsing %s.ini\n", name);
- options_parse_ini_file(options, mame_core_file(file), priority);
+ options_parse_ini_file(options, mame_core_file(file), priority, OPTION_PRIORITY_DRIVER_INI);
mame_fclose(file);
return TRUE;
}
diff --git a/src/lib/util/options.c b/src/lib/util/options.c
index d2d88e77174..29a8a026a4d 100644
--- a/src/lib/util/options.c
+++ b/src/lib/util/options.c
@@ -544,7 +544,7 @@ int options_force_option_callback(core_options *opts, const char *optionname, co
of entries in an INI file
-------------------------------------------------*/
-int options_parse_ini_file(core_options *opts, core_file *inifile, int priority)
+int options_parse_ini_file(core_options *opts, core_file *inifile, int priority, int ignoreprio)
{
char buffer[4096];
@@ -594,7 +594,7 @@ int options_parse_ini_file(core_options *opts, core_file *inifile, int priority)
data = find_entry_data(opts, optionname, FALSE);
if (data == NULL)
{
- message(opts, OPTMSG_WARNING, "Warning: unknown option in INI: %s\n", optionname);
+ if (priority >= ignoreprio) message(opts, OPTMSG_WARNING, "Warning: unknown option in INI: %s\n", optionname);
continue;
}
if ((data->flags & (OPTION_DEPRECATED | OPTION_INTERNAL)) != 0)
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index 51a740666b8..f54853506e8 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -175,7 +175,7 @@ int options_parse_command_line(core_options *opts, int argc, char **argv, int pr
int options_force_option_callback(core_options *opts, const char *optionname, const char *newval, int priority);
/* parse option data from an INI file */
-int options_parse_ini_file(core_options *opts, core_file *inifile, int priority);
+int options_parse_ini_file(core_options *opts, core_file *inifile, int priority, int ignoreprio);