diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:39 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:39 -0800 |
commit | d470b7ad008c690baee6d83e4f987c49550b8f3e (patch) | |
tree | 99de0b121c374f87c505fad38ba7a64bdb6053f6 | |
parent | 5550449812e26d97d4a70251c5027b1015351c91 (diff) | |
parent | e2a5a028c778febb6776da16ab18fb4de79014f0 (diff) | |
download | git-d470b7ad008c690baee6d83e4f987c49550b8f3e.tar.gz |
Merge branch 'bw/oidmap-autoinit'
Code clean-up.
* bw/oidmap-autoinit:
oidmap: ensure map is initialized
-rw-r--r-- | oidmap.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -33,12 +33,19 @@ void oidmap_free(struct oidmap *map, int free_entries) void *oidmap_get(const struct oidmap *map, const struct object_id *key) { + if (!map->map.cmpfn) + return NULL; + return hashmap_get_from_hash(&map->map, hash(key), key); } void *oidmap_remove(struct oidmap *map, const struct object_id *key) { struct hashmap_entry entry; + + if (!map->map.cmpfn) + oidmap_init(map, 0); + hashmap_entry_init(&entry, hash(key)); return hashmap_remove(&map->map, &entry, key); } @@ -46,6 +53,10 @@ void *oidmap_remove(struct oidmap *map, const struct object_id *key) void *oidmap_put(struct oidmap *map, void *entry) { struct oidmap_entry *to_put = entry; + + if (!map->map.cmpfn) + oidmap_init(map, 0); + hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid)); return hashmap_put(&map->map, to_put); } |