[Commit] fontconfig/src fccfg.c,1.38,1.39

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/fontconfig/src
In directory home.keithp.com:/tmp/cvs-serv26104

Modified Files:
	fccfg.c 
Log Message:
Allow config->cache to be null (as it is when $HOME is not set)

Index: fccfg.c
===================================================================
RCS file: /local/src/CVS/fontconfig/src/fccfg.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- fccfg.c	15 Jun 2003 22:45:12 -0000	1.38
+++ fccfg.c	26 Jun 2003 00:39:04 -0000	1.39
@@ -178,7 +178,8 @@
     FcStrSetDestroy (config->acceptGlobs);
     FcStrSetDestroy (config->rejectGlobs);
 
-    FcStrFree (config->cache);
+    if (config->cache)
+	FcStrFree (config->cache);
 
     FcSubstDestroy (config->substPattern);
     FcSubstDestroy (config->substFont);
@@ -211,7 +212,8 @@
     if (!cache)
 	goto bail1;
 
-    FcGlobalCacheLoad (cache, config->cache);
+    if (config->cache)
+	FcGlobalCacheLoad (cache, config->cache);
 
     list = FcConfigGetFontDirs (config);
     if (!list)
@@ -230,7 +232,8 @@
     if (FcDebug () & FC_DBG_FONTSET)
 	FcFontSetPrint (fonts);
 
-    FcGlobalCacheSave (cache, config->cache);
+    if (config->cache)
+	FcGlobalCacheSave (cache, config->cache);
     FcGlobalCacheDestroy (cache);
 
     FcConfigSetFonts (config, fonts, FcSetSystem);