Commit 71a54317efc465c0ccba8fd8d588d03087433048
2017-01-25T14:32:23
khash: avoid using `kh_key` 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
diff --git a/src/cache.c b/src/cache.c
index c5f576a..89c46ef 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -199,10 +199,8 @@ static void *cache_store(git_cache *cache, git_cached_obj *entry)
if (!git_oidmap_valid_index(cache->map, pos)) {
int rval;
- pos = kh_put(oid, cache->map, &entry->oid, &rval);
+ git_oidmap_insert(cache->map, &entry->oid, entry, rval);
if (rval >= 0) {
- kh_key(cache->map, pos) = &entry->oid;
- git_oidmap_value_at(cache->map, pos) = entry;
git_cached_obj_incref(entry);
cache->used_memory += entry->size;
git_atomic_ssize_add(&git_cache__current_storage, (ssize_t)entry->size);
@@ -221,7 +219,7 @@ static void *cache_store(git_cache *cache, git_cached_obj *entry)
git_cached_obj_decref(stored_entry);
git_cached_obj_incref(entry);
- kh_key(cache->map, pos) = &entry->oid;
+ git_oidmap_key(cache->map, pos) = &entry->oid;
git_oidmap_value_at(cache->map, pos) = entry;
} else {
/* NO OP */
diff --git a/src/odb_mempack.c b/src/odb_mempack.c
index 1b8987e..3165710 100644
--- a/src/odb_mempack.c
+++ b/src/odb_mempack.c
@@ -57,7 +57,7 @@ static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void
obj->len = len;
obj->type = type;
- kh_key(db->objects, pos) = &obj->oid;
+ git_oidmap_key(db->objects, pos) = &obj->oid;
git_oidmap_value_at(db->objects, pos) = obj;
if (type == GIT_OBJ_COMMIT) {
diff --git a/src/oidmap.h b/src/oidmap.h
index 6afc8c9..4fab99a 100644
--- a/src/oidmap.h
+++ b/src/oidmap.h
@@ -39,6 +39,7 @@ GIT_INLINE(khint_t) git_oidmap_hash(const git_oid *oid)
#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_key(h, idx) kh_key(h, idx)
#define git_oidmap_value_at(h, idx) kh_val(h, idx)
#define git_oidmap_insert(h, key, val, rval) do { \
diff --git a/src/sortedcache.c b/src/sortedcache.c
index 48e8b6c..199fa24 100644
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -299,7 +299,7 @@ int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
goto done;
if (!error)
- kh_key(sc->map, pos) = item_key;
+ git_strmap_key(sc->map, pos) = item_key;
git_strmap_value_at(sc->map, pos) = item;
error = git_vector_insert(&sc->items, item);