Commit a853c5272359f7b5b1f0648cf16cefe7434840b2
2017-01-25T14:14:32
khash: avoid using `kh_get` directly
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/src/cache.c b/src/cache.c
index 7ababc9..79885c4 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -156,7 +156,7 @@ static void *cache_get(git_cache *cache, const git_oid *oid, unsigned int flags)
if (!git_cache__enabled || git_rwlock_rdlock(&cache->lock) < 0)
return NULL;
- pos = kh_get(oid, cache->map, oid);
+ pos = git_oidmap_lookup_index(cache->map, oid);
if (git_oidmap_valid_index(cache->map, pos)) {
entry = kh_val(cache->map, pos);
@@ -193,7 +193,7 @@ static void *cache_store(git_cache *cache, git_cached_obj *entry)
if (git_cache__current_storage.val > git_cache__max_storage)
cache_evict_entries(cache);
- pos = kh_get(oid, cache->map, &entry->oid);
+ pos = git_oidmap_lookup_index(cache->map, &entry->oid);
/* not found */
if (!git_oidmap_valid_index(cache->map, pos)) {
diff --git a/src/odb_mempack.c b/src/odb_mempack.c
index fc5e0f1..b55ce73 100644
--- a/src/odb_mempack.c
+++ b/src/odb_mempack.c
@@ -82,7 +82,7 @@ static int impl__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb
struct memobject *obj = NULL;
khiter_t pos;
- pos = kh_get(oid, db->objects, oid);
+ pos = git_oidmap_lookup_index(db->objects, oid);
if (!git_oidmap_valid_index(db->objects, pos))
return GIT_ENOTFOUND;
@@ -103,7 +103,7 @@ static int impl__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *
struct memobject *obj = NULL;
khiter_t pos;
- pos = kh_get(oid, db->objects, oid);
+ pos = git_oidmap_lookup_index(db->objects, oid);
if (!git_oidmap_valid_index(db->objects, pos))
return GIT_ENOTFOUND;
diff --git a/src/pack-objects.c b/src/pack-objects.c
index 3517de4..e2b24e8 100644
--- a/src/pack-objects.c
+++ b/src/pack-objects.c
@@ -516,7 +516,7 @@ static int cb_tag_foreach(const char *name, git_oid *oid, void *data)
GIT_UNUSED(name);
- pos = kh_get(oid, pb->object_ix, oid);
+ pos = git_oidmap_lookup_index(pb->object_ix, oid);
if (!git_oidmap_valid_index(pb->object_ix, pos))
return 0;
diff --git a/src/pack.c b/src/pack.c
index e23d501..43ef098 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -117,7 +117,7 @@ static git_pack_cache_entry *cache_get(git_pack_cache *cache, git_off_t offset)
if (git_mutex_lock(&cache->lock) < 0)
return NULL;
- k = kh_get(off, cache->entries, offset);
+ k = git_offmap_lookup_index(cache->entries, offset);
if (git_offmap_valid_index(cache->entries, k)) { /* found it */
entry = kh_value(cache->entries, k);
git_atomic_inc(&entry->refcount);
@@ -956,7 +956,7 @@ git_off_t get_delta_base(
git_oid oid;
git_oid_fromraw(&oid, base_info);
- k = kh_get(oid, p->idx_cache, &oid);
+ k = git_oidmap_lookup_index(p->idx_cache, &oid);
if (git_oidmap_valid_index(p->idx_cache, k)) {
*curpos += 20;
return ((struct git_pack_entry *)kh_value(p->idx_cache, k))->offset;
diff --git a/src/revwalk.c b/src/revwalk.c
index 8805aa8..7526665 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -25,7 +25,7 @@ git_commit_list_node *git_revwalk__commit_lookup(
int ret;
/* lookup and reserve space if not already present */
- pos = kh_get(oid, walk->commits, oid);
+ pos = git_oidmap_lookup_index(walk->commits, oid);
if (git_oidmap_valid_index(walk->commits, pos))
return kh_value(walk->commits, pos);
diff --git a/tests/core/oidmap.c b/tests/core/oidmap.c
index aea0698..2255e39 100644
--- a/tests/core/oidmap.c
+++ b/tests/core/oidmap.c
@@ -33,7 +33,7 @@ void test_core_oidmap__basic(void)
khiter_t pos;
int ret;
- pos = kh_get(oid, map, &items[i].oid);
+ pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(!git_oidmap_valid_index(map, pos));
pos = kh_put(oid, map, &items[i].oid, &ret);
@@ -46,7 +46,7 @@ void test_core_oidmap__basic(void)
for (i = 0; i < NITEMS; ++i) {
khiter_t pos;
- pos = kh_get(oid, map, &items[i].oid);
+ pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(git_oidmap_valid_index(map, pos));
cl_assert_equal_p(kh_val(map, pos), &items[i]);
@@ -87,7 +87,7 @@ void test_core_oidmap__hash_collision(void)
khiter_t pos;
int ret;
- pos = kh_get(oid, map, &items[i].oid);
+ pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(!git_oidmap_valid_index(map, pos));
pos = kh_put(oid, map, &items[i].oid, &ret);
@@ -100,7 +100,7 @@ void test_core_oidmap__hash_collision(void)
for (i = 0; i < NITEMS; ++i) {
khiter_t pos;
- pos = kh_get(oid, map, &items[i].oid);
+ pos = git_oidmap_lookup_index(map, &items[i].oid);
cl_assert(git_oidmap_valid_index(map, pos));
cl_assert_equal_p(kh_val(map, pos), &items[i]);