diff options
| -rw-r--r-- | blame.c | 2 | ||||
| -rw-r--r-- | hashmap.c | 3 | ||||
| -rw-r--r-- | hashmap.h | 2 | ||||
| -rw-r--r-- | merge-recursive.c | 2 | ||||
| -rw-r--r-- | name-hash.c | 4 | ||||
| -rw-r--r-- | packfile.c | 2 | ||||
| -rw-r--r-- | range-diff.c | 2 | ||||
| -rw-r--r-- | sub-process.c | 2 | ||||
| -rw-r--r-- | submodule-config.c | 2 |
9 files changed, 11 insertions, 10 deletions
@@ -473,7 +473,7 @@ static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b) while ((entry_b = hashmap_iter_next(&iter))) { if ((entry_a = hashmap_get(&a->map, &entry_b->entry, NULL))) { if (entry_a->count <= entry_b->count) - hashmap_remove(&a->map, entry_b, NULL); + hashmap_remove(&a->map, &entry_b->entry, NULL); else entry_a->count -= entry_b->count; } @@ -218,7 +218,8 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry) } } -void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata) +void *hashmap_remove(struct hashmap *map, const struct hashmap_entry *key, + const void *keydata) { struct hashmap_entry *old; struct hashmap_entry **e = find_entry_ptr(map, key, keydata); @@ -349,7 +349,7 @@ void *hashmap_put(struct hashmap *map, void *entry); * * Argument explanation is the same as in `hashmap_get`. */ -void *hashmap_remove(struct hashmap *map, const void *key, +void *hashmap_remove(struct hashmap *map, const struct hashmap_entry *key, const void *keydata); /* diff --git a/merge-recursive.c b/merge-recursive.c index 2d31a3e279..f60451d396 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2001,7 +2001,7 @@ static void remove_hashmap_entries(struct hashmap *dir_renames, for (i = 0; i < items_to_remove->nr; i++) { entry = items_to_remove->items[i].util; - hashmap_remove(dir_renames, entry, NULL); + hashmap_remove(dir_renames, &entry->ent, NULL); } string_list_clear(items_to_remove, 0); } 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); diff --git a/packfile.c b/packfile.c index f7402c470b..3edd648de0 100644 --- a/packfile.c +++ b/packfile.c @@ -1423,7 +1423,7 @@ static int in_delta_base_cache(struct packed_git *p, off_t base_offset) */ static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent) { - hashmap_remove(&delta_base_cache, ent, &ent->key); + hashmap_remove(&delta_base_cache, &ent->ent, &ent->key); list_del(&ent->lru); delta_base_cached -= ent->size; free(ent); diff --git a/range-diff.c b/range-diff.c index 96f955d84d..c51cfd5556 100644 --- a/range-diff.c +++ b/range-diff.c @@ -229,7 +229,7 @@ static void find_exact_matches(struct string_list *a, struct string_list *b) util->patch = b->items[i].string; util->diff = util->patch + util->diff_offset; hashmap_entry_init(&util->e, strhash(util->diff)); - other = hashmap_remove(&map, util, NULL); + other = hashmap_remove(&map, &util->e, NULL); if (other) { if (other->matching >= 0) BUG("already assigned!"); diff --git a/sub-process.c b/sub-process.c index debd86bb68..99fccef592 100644 --- a/sub-process.c +++ b/sub-process.c @@ -58,7 +58,7 @@ void subprocess_stop(struct hashmap *hashmap, struct subprocess_entry *entry) kill(entry->process.pid, SIGTERM); finish_command(&entry->process); - hashmap_remove(hashmap, entry, NULL); + hashmap_remove(hashmap, &entry->ent, NULL); } static void subprocess_exit_handler(struct child_process *process) diff --git a/submodule-config.c b/submodule-config.c index 58d585cd7d..7486745a6a 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -137,7 +137,7 @@ static void cache_remove_path(struct submodule_cache *cache, struct submodule_entry *removed; hashmap_entry_init(&e.ent, hash); e.config = submodule; - removed = hashmap_remove(&cache->for_path, &e, NULL); + removed = hashmap_remove(&cache->for_path, &e.ent, NULL); free(removed); } |