summaryrefslogtreecommitdiff
path: root/name-hash.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-10-06 23:30:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 01:20:11 (GMT)
commitf23a465132a22860684ac66052cf9a954a18e27d (patch)
tree0af87116e641be6cc7f7dc75e1a337e917abc610 /name-hash.c
parentf0e63c41139f8982add435536d39aff6f3d4ca98 (diff)
downloadgit-f23a465132a22860684ac66052cf9a954a18e27d.zip
git-f23a465132a22860684ac66052cf9a954a18e27d.tar.gz
git-f23a465132a22860684ac66052cf9a954a18e27d.tar.bz2
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 <e@80x24.org> Reviewed-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'name-hash.c')
-rw-r--r--name-hash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/name-hash.c b/name-hash.c
index 73b83ad..aa8253d 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -35,7 +35,8 @@ static struct dir_entry *find_dir_entry__hash(struct index_state *istate,
struct dir_entry key;
hashmap_entry_init(&key.ent, hash);
key.namelen = namelen;
- return hashmap_get(&istate->dir_hash, &key.ent, name);
+ return hashmap_get_entry(&istate->dir_hash, &key, name,
+ struct dir_entry, ent);
}
static struct dir_entry *find_dir_entry(struct index_state *istate,