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

Only add a config file to the set of config files once. 

reviewed by: plam
This commit is contained in:
Patrick Lam 2005-11-30 22:13:21 +00:00
parent 93a27747a4
commit cb6d97eb1b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-30 Behdad Befahbod <behdad@cs.toronto.edu>
reviewed by: plam
* src/fcxml.c (FcConfigParseAndLoad):
Only add a config file to the set of config files once.
2005-11-29 Patrick Lam <plam@mit.edu> 2005-11-29 Patrick Lam <plam@mit.edu>
* src/fcint.h (FcCacheBankToIndex); * src/fcint.h (FcCacheBankToIndex);

6
src/fcxml.c
View File

@ -2368,6 +2368,12 @@ FcConfigParseAndLoad (FcConfig *config,
if (!filename) if (!filename)
goto bail0; goto bail0;
if (FcStrSetMember (config->configFiles, filename))
{
FcStrFree (filename);
return FcTrue;
}
if (!FcStrSetAdd (config->configFiles, filename)) if (!FcStrSetAdd (config->configFiles, filename))
{ {
FcStrFree (filename); FcStrFree (filename);