hashmap_remove takes "const struct hashmap_entry *"

Eric Wong · gitster · commit 28ee79412808 · 2019-10-07T10:20:10.000+09:00
This is less error-prone than "const void *" as the compiler
now detects invalid types being passed.

Signed-off-by: Eric Wong &lt;e@80x24.org&gt;
Reviewed-by: Derrick Stolee &lt;stolee@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/blame.c b/blame.c
@@ -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;
 		}
diff --git a/hashmap.c b/hashmap.c
@@ -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);
diff --git a/hashmap.h b/hashmap.h
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ static void fingerprint_subtract(struct fingerprint a, struct fingerprint b)`
`473`	`473`	`while ((entry_b = hashmap_iter_next(&iter))) {`
`474`	`474`	`if ((entry_a = hashmap_get(&a->map, &entry_b->entry, NULL))) {`
`475`	`475`	`if (entry_a->count <= entry_b->count)`
`476`		`- hashmap_remove(&a->map, entry_b, NULL);`
	`476`	`+ hashmap_remove(&a->map, &entry_b->entry, NULL);`
`477`	`477`	`else`
`478`	`478`	`entry_a->count -= entry_b->count;`
`479`	`479`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,8 @@ void hashmap_add(struct hashmap map, struct hashmap_entry entry)`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`-void hashmap_remove(struct hashmap map, const void key, const void keydata)`
	`221`	`+void hashmap_remove(struct hashmap map, const struct hashmap_entry *key,`
	`222`	`+ const void *keydata)`
`222`	`223`	`{`
`223`	`224`	`struct hashmap_entry *old;`
`224`	`225`	`struct hashmap_entry **e = find_entry_ptr(map, key, keydata);`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ void hashmap_put(struct hashmap map, void *entry);`
`349`	`349`	`*`
`350`	`350`	* Argument explanation is the same as in `hashmap_get`.
`351`	`351`	`*/`
`352`		`-void hashmap_remove(struct hashmap map, const void *key,`
	`352`	`+void hashmap_remove(struct hashmap map, const struct hashmap_entry *key,`
`353`	`353`	`const void *keydata);`
`354`	`354`
`355`	`355`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -2001,7 +2001,7 @@ static void remove_hashmap_entries(struct hashmap *dir_renames,`
`2001`	`2001`
`2002`	`2002`	`for (i = 0; i < items_to_remove->nr; i++) {`
`2003`	`2003`	`entry = items_to_remove->items[i].util;`
`2004`		`- hashmap_remove(dir_renames, entry, NULL);`
	`2004`	`+ hashmap_remove(dir_renames, &entry->ent, NULL);`
`2005`	`2005`	`}`
`2006`	`2006`	`string_list_clear(items_to_remove, 0);`
`2007`	`2007`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1423,7 +1423,7 @@ static int in_delta_base_cache(struct packed_git *p, off_t base_offset)`
`1423`	`1423`	`*/`
`1424`	`1424`	`static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)`
`1425`	`1425`	`{`
`1426`		`- hashmap_remove(&delta_base_cache, ent, &ent->key);`
	`1426`	`+ hashmap_remove(&delta_base_cache, &ent->ent, &ent->key);`
`1427`	`1427`	`list_del(&ent->lru);`
`1428`	`1428`	`delta_base_cached -= ent->size;`
`1429`	`1429`	`free(ent);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void subprocess_stop(struct hashmap hashmap, struct subprocess_entry entry)`
`58`	`58`	`kill(entry->process.pid, SIGTERM);`
`59`	`59`	`finish_command(&entry->process);`
`60`	`60`
`61`		`- hashmap_remove(hashmap, entry, NULL);`
	`61`	`+ hashmap_remove(hashmap, &entry->ent, NULL);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static void subprocess_exit_handler(struct child_process *process)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static void cache_remove_path(struct submodule_cache *cache,`
`137`	`137`	`struct submodule_entry *removed;`
`138`	`138`	`hashmap_entry_init(&e.ent, hash);`
`139`	`139`	`e.config = submodule;`
`140`		`- removed = hashmap_remove(&cache->for_path, &e, NULL);`
	`140`	`+ removed = hashmap_remove(&cache->for_path, &e.ent, NULL);`
`141`	`141`	`free(removed);`
`142`	`142`	`}`
`143`	`143`