mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hashmap_get{,_from_hash} return "struct hashmap_entry *"

Browse Source 
Update callers to use hashmap_get_entry, hashmap_get_entry_from_hash
or container_of as appropriate.

This is another step towards eliminating the requirement of
hashmap_entry being the first field in a struct.

Signed-off-by: Eric Wong <e@80x24.org>
Reviewed-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Wong
2019-10-06 23:30:36 +00:00
committed by Junio C Hamano
parent f0e63c4113
commit f23a465132
20 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
submodule-config.c
View File

@ -166,7 +166,8 @@ static const struct submodule *cache_lookup_path(struct submodule_cache *cache,
hashmap_entry_init(&key.ent, hash);
key.config = &key_config;
entry = hashmap_get(&cache->for_path, &key.ent, NULL);
entry = hashmap_get_entry(&cache->for_path, &key, NULL,
struct submodule_entry, ent);
if (entry)
return entry->config;
return NULL;
@ -186,7 +187,8 @@ static struct submodule *cache_lookup_name(struct submodule_cache *cache,
hashmap_entry_init(&key.ent, hash);
key.config = &key_config;
entry = hashmap_get(&cache->for_name, &key.ent, NULL);
entry = hashmap_get_entry(&cache->for_name, &key, NULL,
struct submodule_entry, ent);
if (entry)
return entry->config;
return NULL;