From c25886cea334b57e0329537db6b025138b378df5 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 21 Jan 2011 09:17:35 +0000 Subject: Ignore warnings for non existing options in previous level of ini files (parent for example) (no whatsnew) --- src/lib/util/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/util/options.c') 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) -- cgit v1.2.3-70-g09d2