walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Keep the same behavior to the return value of FcConfigParseAndLoad 

reverting the behavior accidentally changed by 12b750

https://bugs.freedesktop.org/show_bug.cgi?id=102141
This commit is contained in:
Akira TAGOH 2017-08-13 16:18:35 +09:00
parent 41bc5eab84
commit dc56ff8040
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fcxml.c
View File

@ -3368,7 +3368,10 @@ FcConfigParseAndLoad (FcConfig *config,
f = FcConfigFilename (name); f = FcConfigFilename (name);
if (!f) if (!f)
{
ret = FcTrue;
goto bail0; goto bail0;
}
if (sysroot) if (sysroot)
filename = FcStrBuildFilename (sysroot, f, NULL); filename = FcStrBuildFilename (sysroot, f, NULL);
else else
@ -3399,6 +3402,7 @@ FcConfigParseAndLoad (FcConfig *config,
fd = FcOpen ((char *) filename, O_RDONLY); fd = FcOpen ((char *) filename, O_RDONLY);
if (fd == -1) { if (fd == -1) {
FcStrFree (filename); FcStrFree (filename);
ret = FcTrue;
goto bail1; goto bail1;
} }