summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2017-02-24 08:51:50 +0100
committerGitHub <noreply@github.com>2017-02-24 08:51:50 +0100
commit7f875fb4f68e3d6d5de0809785a582466c5de86e (patch)
treeb2e3ae469acca0ea211c6255d98e53dc2bbc83df
parentc03f00ea9c83ccb6ca44d0760bfec5f21cfc9282 (diff)
parent685f22519c617e087a74b0754a10ceebc1ec9d77 (diff)
downloadlibgit2-7f875fb4f68e3d6d5de0809785a582466c5de86e.tar.gz
Merge pull request #4133 from stinb/khash-cleanup-regression
fix regression from #4092
-rw-r--r--src/pack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pack.c b/src/pack.c
index d59fae412..60b757e90 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -128,13 +128,13 @@ static git_pack_cache_entry *cache_get(git_pack_cache *cache, git_off_t offset)
/* Run with the cache lock held */
static void free_lowest_entry(git_pack_cache *cache)
{
+ git_off_t offset;
git_pack_cache_entry *entry;
- khiter_t k;
- git_offmap_foreach(cache->entries, k, entry, {
+ git_offmap_foreach(cache->entries, offset, entry, {
if (entry && entry->refcount.val == 0) {
cache->memory_used -= entry->raw.len;
- git_offmap_delete_at(cache->entries, k);
+ git_offmap_delete(cache->entries, offset);
free_cache_object(entry);
}
});