fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 03:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xmlconfig: Warn if parsing the engine/app versions fails.

Browse source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7048>
This commit is contained in:
Eric Anholt 2020-10-02 16:58:09 -07:00 • committed by Marge Bot
parent 1618bd1bee
commit b4ae9e07cd
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/util/xmlconfig.c
View file

@ -741,9 +741,13 @@ parseAppAttr(struct OptConfData *data, const char **attr)
}
if (application_versions) {
driOptionValue v = { ._int = data->applicationVersion };
if (parseRange(&version_range, application_versions) &&
!checkValue(&v, &version_range))
data->ignoringApp = data->inApp;
if (parseRange(&version_range, application_versions)) {
if (!checkValue(&v, &version_range))
data->ignoringApp = data->inApp;
} else {
XML_WARNING("Failed to parse application_versions range=\"%s\".",
application_versions);
}
}
}
@ -774,9 +778,13 @@ parseEngineAttr(struct OptConfData *data, const char **attr)
}
if (engine_versions) {
driOptionValue v = { ._int = data->engineVersion };
if (parseRange(&version_range, engine_versions) &&
!checkValue(&v, &version_range))
data->ignoringApp = data->inApp;
if (parseRange(&version_range, engine_versions)) {
if (!checkValue(&v, &version_range))
data->ignoringApp = data->inApp;
} else {
XML_WARNING("Failed to parse engine_versions range=\"%s\".",
engine_versions);
}
}
}