Commit 7f875fb4f68e3d6d5de0809785a582466c5de86e

Patrick Steinhardt 2017-02-24T08:51:50

Merge pull request #4133 from stinb/khash-cleanup-regression fix regression from #4092

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/pack.c b/src/pack.c
index d59fae4..60b757e 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);
 		}
 	});