src/fcxml.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 052115aa83c9927768ab970443250fb4ed9c0fca
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Thu Sep 21 14:04:10 2017 +0900
Fix again to keep the same behavior to the return value of FcConfigParseAndLoad
https://bugs.freedesktop.org/show_bug.cgi?id=102141
diff --git a/src/fcxml.c b/src/fcxml.c
index 4b08486..ce17b64 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3374,7 +3374,7 @@ bail0:
FcConfigMessage (0, FcSevereError, "Cannot load default config file");
return FcFalse;
}
- return ret;
+ return FcTrue;
}
#define __fcxml__
#include "fcaliastail.h"
commit 5603e06aeba57cb2c7044c9cc6001d0cef5039f4
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Thu Sep 21 14:03:51 2017 +0900
Revert "Keep the same behavior to the return value of FcConfigParseAndLoad"
This reverts commit dc56ff80408b16393d645a55788b023f1de27bc9.
diff --git a/src/fcxml.c b/src/fcxml.c
index 842d609..4b08486 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3314,10 +3314,7 @@ FcConfigParseAndLoad (FcConfig *config,
f = FcConfigFilename (name);
if (!f)
- {
- ret = FcTrue;
goto bail0;
- }
if (sysroot)
filename = FcStrBuildFilename (sysroot, f, NULL);
else
@@ -3348,7 +3345,6 @@ FcConfigParseAndLoad (FcConfig *config,
fd = FcOpen ((char *) filename, O_RDONLY);
if (fd == -1) {
FcStrFree (filename);
- ret = FcTrue;
goto bail1;
}
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
