Eliminate NormalizeDir. Eliminate gratuitous stat/access calls per dir.

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 4463b3130cceba58000af27378d3708b2c3853e8..145226072571abe2d4a6880ee1727359edb26501 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -129,7 +129,6 @@ FcDirScanConfig (FcFontSet  *set,
     FcChar8            **dirlist;
     int                        dirlistlen, dirlistalloc;
     FcChar8            *file;
-    const FcChar8      *d_can = 0;
     FcChar8            *base;
     FcBool             ret = FcTrue;
     FcFontSet          *tmpSet;
@@ -138,11 +137,6 @@ FcDirScanConfig (FcFontSet *set,
     if (config && !FcConfigAcceptFilename (config, dir))
        return FcTrue;
 
-    if (config)
-       d_can = FcConfigNormalizeFontDir (config, dir);
-    if (d_can)
-       dir = d_can;
-
     if (!force)
     {
        /*
@@ -151,8 +145,8 @@ FcDirScanConfig (FcFontSet  *set,
        if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
            return FcTrue;
 
-       if (FcDirCacheValid (dir) && 
-           FcDirCacheHasCurrentArch (dir) &&
+       if (FcDirCacheValid (dir, config) && 
+           FcDirCacheHasCurrentArch (dir, config) &&
            FcDirCacheRead (set, dirs, dir, config))
            return FcTrue;
     }
@@ -277,5 +271,5 @@ FcDirScan (FcFontSet            *set,
 FcBool
 FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
 {
-    return FcDirCacheWrite (set, dirs, dir);
+    return FcDirCacheWrite (set, dirs, dir, FcConfigGetCurrent ());
 }