diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
| commit | ecc59cb52ffe4a84fddae997bba64adad35d5e93 (patch) | |
| tree | 233c2cf0ea65dcf0b671f28e14b1fb083dac87e3 /fontconfig/src/fcdir.c | |
| parent | d19dd4c9cf37b7b691552c4f4dd873471e31ca68 (diff) | |
| parent | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (diff) | |
| download | vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.gz vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.bz2 vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/src/fcdir.c')
| -rw-r--r-- | fontconfig/src/fcdir.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/fontconfig/src/fcdir.c b/fontconfig/src/fcdir.c index 8a2b97625..d8b094fbc 100644 --- a/fontconfig/src/fcdir.c +++ b/fontconfig/src/fcdir.c @@ -235,7 +235,6 @@ FcCache * FcDirCacheScan (const FcChar8 *dir, FcConfig *config) { FcStrSet *dirs; - FcBool ret = FcTrue; FcFontSet *set; FcCache *cache = NULL; struct stat dir_stat; @@ -244,44 +243,28 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config) printf ("cache scan dir %s\n", dir); if (FcStat (dir, &dir_stat) < 0) - { - if (errno != ENOENT) - ret = FcFalse; goto bail; - } set = FcFontSetCreate(); if (!set) - { - ret = FcFalse; goto bail; - } dirs = FcStrSetCreate (); if (!dirs) - { - ret = FcFalse; goto bail1; - } /* * Scan the dir */ if (!FcDirScanConfig (set, dirs, NULL, dir, FcTrue, config)) - { - ret = FcFalse; goto bail2; - } /* * Build the cache object */ cache = FcDirCacheBuild (set, dir, &dir_stat, dirs); if (!cache) - { - ret = FcFalse; goto bail2; - } /* * Write out the cache file, ignoring any troubles |