diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:19 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:19 (GMT) |
commit | c62bff2cedead7df6fc55a745f073715da30727e (patch) | |
tree | f615f67724c780591786ed12c8a97088443e6c2a /oidmap.c | |
parent | 4308d81d456c8c3ecc2c33af7f4d834de95130b9 (diff) | |
parent | fbec05c21093e0ffa44b0cfff8ce47e1b5461c4e (diff) | |
download | git-c62bff2cedead7df6fc55a745f073715da30727e.zip git-c62bff2cedead7df6fc55a745f073715da30727e.tar.gz git-c62bff2cedead7df6fc55a745f073715da30727e.tar.bz2 |
Merge branch 'cc/test-oidmap'
Extend the test coverage a bit.
* cc/test-oidmap:
t0016: add 'remove' subcommand test
test-oidmap: remove 'add' subcommand
test-hashmap: remove 'hash' command
oidmap: use sha1hash() instead of static hash() function
t: add t0016-oidmap.sh
t/helper: add test-oidmap.c
Diffstat (limited to 'oidmap.c')
-rw-r--r-- | oidmap.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -12,13 +12,6 @@ static int oidmap_neq(const void *hashmap_cmp_fn_data, &((const struct oidmap_entry *) entry_or_key)->oid); } -static int hash(const struct object_id *oid) -{ - int hash; - memcpy(&hash, oid->hash, sizeof(hash)); - return hash; -} - void oidmap_init(struct oidmap *map, size_t initial_size) { hashmap_init(&map->map, oidmap_neq, NULL, initial_size); @@ -36,7 +29,7 @@ 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); + return hashmap_get_from_hash(&map->map, oidhash(key), key); } void *oidmap_remove(struct oidmap *map, const struct object_id *key) @@ -46,7 +39,7 @@ void *oidmap_remove(struct oidmap *map, const struct object_id *key) if (!map->map.cmpfn) oidmap_init(map, 0); - hashmap_entry_init(&entry, hash(key)); + hashmap_entry_init(&entry, oidhash(key)); return hashmap_remove(&map->map, &entry, key); } @@ -57,6 +50,6 @@ void *oidmap_put(struct oidmap *map, void *entry) if (!map->map.cmpfn) oidmap_init(map, 0); - hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid)); + hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid)); return hashmap_put(&map->map, to_put); } |