diff options
| author | Eric Wong <e@80x24.org> | 2019-10-06 23:30:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 10:20:10 +0900 |
| commit | 28ee7941280828f9e528bd8c5d0f6515a57e0c44 (patch) | |
| tree | 8ccc5bad88aad148e83cccfd1835752188d8640a /name-hash.c | |
| parent | b6c5241606e67b57470e86ccf547d4ab90008a1d (diff) | |
| download | git-28ee7941280828f9e528bd8c5d0f6515a57e0c44.tar.gz | |
hashmap_remove takes "const struct hashmap_entry *"
This is less error-prone than "const void *" as the compiler
now detects invalid types being passed.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/name-hash.c b/name-hash.c index 4eaeded775..44d788f1ce 100644 --- a/name-hash.c +++ b/name-hash.c @@ -95,7 +95,7 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce) struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce)); while (dir && !(--dir->nr)) { struct dir_entry *parent = dir->parent; - hashmap_remove(&istate->dir_hash, dir, NULL); + hashmap_remove(&istate->dir_hash, &dir->ent, NULL); free(dir); dir = parent; } @@ -625,7 +625,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce) if (!istate->name_hash_initialized || !(ce->ce_flags & CE_HASHED)) return; ce->ce_flags &= ~CE_HASHED; - hashmap_remove(&istate->name_hash, ce, ce); + hashmap_remove(&istate->name_hash, &ce->ent, ce); if (ignore_case) remove_dir_entry(istate, ce); |