kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'bw/oidmap-autoinit' into maint 

Code clean-up.

* bw/oidmap-autoinit:
  oidmap: ensure map is initialized
maint
Junio C Hamano 2018-03-22 14:24:12 -07:00
parent dab684ff43 e2a5a028c7
commit 6ef449ea77
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oidmap.c
View File

@ -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) 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, hash(key), key);
} }


void *oidmap_remove(struct oidmap *map, const struct object_id *key) void *oidmap_remove(struct oidmap *map, const struct object_id *key)
{ {
struct hashmap_entry entry; struct hashmap_entry entry;

if (!map->map.cmpfn)
oidmap_init(map, 0);

hashmap_entry_init(&entry, hash(key)); hashmap_entry_init(&entry, hash(key));
return hashmap_remove(&map->map, &entry, 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) void *oidmap_put(struct oidmap *map, void *entry)
{ {
struct oidmap_entry *to_put = 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)); hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
return hashmap_put(&map->map, to_put); return hashmap_put(&map->map, to_put);
} }