From 76e671a653360f816765fe55b367d29946361490 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Wed, 25 Jan 2017 14:20:56 +0100 Subject: [PATCH] khash: avoid using `kh_exist` directly --- src/cache.c | 2 +- src/oidmap.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cache.c b/src/cache.c index 0309c3d8e..ae42216c9 100644 --- a/src/cache.c +++ b/src/cache.c @@ -127,7 +127,7 @@ static void cache_evict_entries(git_cache *cache) while (evict_count > 0) { khiter_t pos = seed++ % git_oidmap_end(cache->map); - if (kh_exist(cache->map, pos)) { + if (git_oidmap_has_data(cache->map, pos)) { git_cached_obj *evict = kh_val(cache->map, pos); evict_count--; diff --git a/src/oidmap.h b/src/oidmap.h index c0c45027d..6afc8c916 100644 --- a/src/oidmap.h +++ b/src/oidmap.h @@ -37,6 +37,7 @@ GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid) #define git_oidmap_valid_index(h, idx) (idx != kh_end(h)) #define git_oidmap_exists(h, k) (kh_get(oid, h, k) != kh_end(h)) +#define git_oidmap_has_data(h, idx) kh_exist(h, idx) #define git_oidmap_value_at(h, idx) kh_val(h, idx)