diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-01-25 14:05:24 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-02-17 11:41:06 +0100 |
| commit | 63e914cbf4e6cb07d39b5a6f31749f78247ff594 (patch) | |
| tree | 3556c9b0723929a4ebd3084596a56943813b3b08 | |
| parent | a1b23df58cb704a1ac3e0670a26c804d8a08ed2e (diff) | |
| download | libgit2-63e914cbf4e6cb07d39b5a6f31749f78247ff594.tar.gz | |
khash: avoid using `kh_size` directly
| -rw-r--r-- | src/cache.c | 10 | ||||
| -rw-r--r-- | src/cache.h | 2 | ||||
| -rw-r--r-- | src/submodule.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/cache.c b/src/cache.c index 16ae9b397..e8fd207b1 100644 --- a/src/cache.c +++ b/src/cache.c @@ -47,11 +47,11 @@ void git_cache_dump_stats(git_cache *cache) { git_cached_obj *object; - if (kh_size(cache->map) == 0) + if (git_cache_size(cache) == 0) return; - printf("Cache %p: %d items cached, %"PRIdZ" bytes\n", - cache, kh_size(cache->map), cache->used_memory); + printf("Cache %p: %"PRIuZ" items cached, %"PRIdZ" bytes\n", + cache, git_cache_size(cache), cache->used_memory); kh_foreach_value(cache->map, object, { char oid_str[9]; @@ -81,7 +81,7 @@ static void clear_cache(git_cache *cache) { git_cached_obj *evict = NULL; - if (kh_size(cache->map) == 0) + if (git_cache_size(cache) == 0) return; kh_foreach_value(cache->map, evict, { @@ -119,7 +119,7 @@ static void cache_evict_entries(git_cache *cache) ssize_t evicted_memory = 0; /* do not infinite loop if there's not enough entries to evict */ - if (evict_count > kh_size(cache->map)) { + if (evict_count > git_cache_size(cache)) { clear_cache(cache); return; } diff --git a/src/cache.h b/src/cache.h index 697123739..0f0bfcf5d 100644 --- a/src/cache.h +++ b/src/cache.h @@ -53,7 +53,7 @@ void *git_cache_get_any(git_cache *cache, const git_oid *oid); GIT_INLINE(size_t) git_cache_size(git_cache *cache) { - return (size_t)kh_size(cache->map); + return (size_t)git_oidmap_size(cache->map); } GIT_INLINE(void) git_cached_obj_incref(void *_obj) diff --git a/src/submodule.c b/src/submodule.c index 3007d25df..0bc25cc29 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -555,7 +555,7 @@ int git_submodule_foreach( goto done; if (!(error = git_vector_init( - &snapshot, kh_size(submodules), submodule_cmp))) { + &snapshot, git_strmap_num_entries(submodules), submodule_cmp))) { git_strmap_foreach_value(submodules, sm, { if ((error = git_vector_insert(&snapshot, sm)) < 0) |