From f23a465132a22860684ac66052cf9a954a18e27d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 6 Oct 2019 23:30:36 +0000 Subject: hashmap_get{,_from_hash} return "struct hashmap_entry *" 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 Reviewed-by: Derrick Stolee Signed-off-by: Junio C Hamano --- submodule-config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'submodule-config.c') diff --git a/submodule-config.c b/submodule-config.c index 9248c5ea5b..b031884789 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -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; -- cgit v1.2.3