diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2015-05-27 14:36:35 -0700 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2015-05-27 14:36:35 -0700 |
commit | ee2d1da2d21bc14127f4cf12312e1f007935e8b0 (patch) | |
tree | 91ba41f7947044a672647a502821441956011c1e /src/fccache.c | |
parent | 5bad26ccb6686f1b9c8df6c1e9b49a72d42ad661 (diff) | |
download | fontconfig-ee2d1da2d21bc14127f4cf12312e1f007935e8b0.tar.gz |
Reduce number of places that cache version is specified to 1
Diffstat (limited to 'src/fccache.c')
-rw-r--r-- | src/fccache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fccache.c b/src/fccache.c index 25538bd..fc3ed41 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -655,7 +655,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di allocated = FcTrue; } if (cache->magic != FC_CACHE_MAGIC_MMAP || - cache->version < FC_CACHE_CONTENT_VERSION || + cache->version < FC_CACHE_VERSION_NUMBER || cache->size != (intptr_t) fd_stat->st_size || !FcCacheTimeValid (config, cache, dir_stat) || !FcCacheDirsValid (config, cache) || @@ -751,7 +751,7 @@ FcDirCacheValidateHelper (FcConfig *config, int fd, struct stat *fd_stat, struct ret = FcFalse; else if (c.magic != FC_CACHE_MAGIC_MMAP) ret = FcFalse; - else if (c.version < FC_CACHE_CONTENT_VERSION) + else if (c.version < FC_CACHE_VERSION_NUMBER) ret = FcFalse; else if (fd_stat->st_size != c.size) ret = FcFalse; @@ -828,7 +828,7 @@ FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcSt serialize->linear = cache; cache->magic = FC_CACHE_MAGIC_ALLOC; - cache->version = FC_CACHE_CONTENT_VERSION; + cache->version = FC_CACHE_VERSION_NUMBER; cache->size = serialize->size; cache->checksum = (int) dir_stat->st_mtime; |