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

Allow config->cache to be null (as it is when $HOME is not set)

This commit is contained in:
Keith Packard 2003-06-26 00:39:04 +00:00
parent 79621aa5c7
commit ee1debfdd9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fccfg.c
View File

@ -178,7 +178,8 @@ FcConfigDestroy (FcConfig *config)
FcStrSetDestroy (config->acceptGlobs); FcStrSetDestroy (config->acceptGlobs);
FcStrSetDestroy (config->rejectGlobs); FcStrSetDestroy (config->rejectGlobs);
FcStrFree (config->cache); if (config->cache)
FcStrFree (config->cache);
FcSubstDestroy (config->substPattern); FcSubstDestroy (config->substPattern);
FcSubstDestroy (config->substFont); FcSubstDestroy (config->substFont);
@ -211,7 +212,8 @@ FcConfigBuildFonts (FcConfig *config)
if (!cache) if (!cache)
goto bail1; goto bail1;
FcGlobalCacheLoad (cache, config->cache); if (config->cache)
FcGlobalCacheLoad (cache, config->cache);
list = FcConfigGetFontDirs (config); list = FcConfigGetFontDirs (config);
if (!list) if (!list)
@ -230,7 +232,8 @@ FcConfigBuildFonts (FcConfig *config)
if (FcDebug () & FC_DBG_FONTSET) if (FcDebug () & FC_DBG_FONTSET)
FcFontSetPrint (fonts); FcFontSetPrint (fonts);
FcGlobalCacheSave (cache, config->cache); if (config->cache)
FcGlobalCacheSave (cache, config->cache);
FcGlobalCacheDestroy (cache); FcGlobalCacheDestroy (cache);
FcConfigSetFonts (config, fonts, FcSetSystem); FcConfigSetFonts (config, fonts, FcSetSystem);