diff options
Diffstat (limited to 'libass/ass_cache.c')
| -rw-r--r-- | libass/ass_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libass/ass_cache.c b/libass/ass_cache.c index 6a699b5f..83b9588d 100644 --- a/libass/ass_cache.c +++ b/libass/ass_cache.c @@ -30,10 +30,10 @@ #include "ass_outline.h" #include "ass_cache.h" -#define FNV1_32A_INIT 0x811c9dc5U +#define ASS_HASH_INIT 0x811c9dc5U #define FNV1_32A_PRIME 16777619U -static inline uint32_t fnv_32a_buf(const void *buf, size_t len, uint32_t hval) +static inline ass_hashcode ass_hash_buf(const void *buf, size_t len, ass_hashcode hval) { if (!len) return hval; @@ -121,7 +121,7 @@ const CacheDesc bitmap_cache_desc = { // composite cache -static uint32_t composite_hash(void *key, uint32_t hval) +static ass_hashcode composite_hash(void *key, ass_hashcode hval) { CompositeHashKey *k = key; hval = filter_hash(&k->filter, hval); @@ -188,7 +188,7 @@ const CacheDesc composite_cache_desc = { // outline cache -static uint32_t outline_hash(void *key, uint32_t hval) +static ass_hashcode outline_hash(void *key, ass_hashcode hval) { OutlineHashKey *k = key; switch (k->type) { @@ -364,7 +364,7 @@ void *ass_cache_get(Cache *cache, void *key, void *priv) { const CacheDesc *desc = cache->desc; size_t key_offs = CACHE_ITEM_SIZE + align_cache(desc->value_size); - unsigned bucket = desc->hash_func(key, FNV1_32A_INIT) % cache->buckets; + unsigned bucket = desc->hash_func(key, ASS_HASH_INIT) % cache->buckets; CacheItem *item = cache->map[bucket]; while (item) { if (desc->compare_func(key, (char *) item + key_offs)) { |