hashmap_put takes "struct hashmap_entry *"

Eric Wong · gitster · commit 26b455f21ed7 · 2019-10-07T10:20:10.000+09:00
This is less error-prone than "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/builtin/fast-export.c b/builtin/fast-export.c
@@ -160,7 +160,7 @@ static const void *anonymize_mem(struct hashmap *map,
 		ret->orig_len = *len;
 		ret->anon = generate(orig, len);
 		ret->anon_len = *len;
-		hashmap_put(map, ret);
+		hashmap_put(map, &ret->hash);
 	}
 
 	*len = ret->anon_len;
diff --git a/hashmap.c b/hashmap.c
@@ -241,7 +241,7 @@ void *hashmap_remove(struct hashmap *map, const struct hashmap_entry *key,
 	return old;
 }
 
-void *hashmap_put(struct hashmap *map, void *entry)
+void *hashmap_put(struct hashmap *map, struct hashmap_entry *entry)
 {
 	struct hashmap_entry *old = hashmap_remove(map, entry, NULL);
 	hashmap_add(map, entry);
diff --git a/hashmap.h b/hashmap.h
@@ -340,7 +340,7 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry);
  * `entry` is the entry to add or replace.
  * Returns the replaced entry, or NULL if not found (i.e. the entry was added).
  */
-void *hashmap_put(struct hashmap *map, void *entry);
+void *hashmap_put(struct hashmap *map, struct hashmap_entry *entry);
 
 /*
  * Removes a hashmap entry matching the specified key. If the hashmap contains
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -2229,7 +2229,7 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
 		if (!entry) {
 			entry = xmalloc(sizeof(*entry));
 			dir_rename_entry_init(entry, old_dir);
-			hashmap_put(dir_renames, entry);
+			hashmap_put(dir_renames, &entry->ent);
 		} else {
 			free(old_dir);
 		}
@@ -2360,7 +2360,7 @@ static void compute_collisions(struct hashmap *collisions,
 						sizeof(struct collision_entry));
 			hashmap_entry_init(&collision_ent->ent,
 						strhash(new_path));
-			hashmap_put(collisions, collision_ent);
+			hashmap_put(collisions, &collision_ent->ent);
 			collision_ent->target_file = new_path;
 		} else {
 			free(new_path);
diff --git a/oidmap.c b/oidmap.c
@@ -51,5 +51,5 @@ void *oidmap_put(struct oidmap *map, void *entry)
 		oidmap_init(map, 0);
 
 	hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
-	return hashmap_put(&map->map, to_put);
+	return hashmap_put(&map->map, &to_put->internal_entry);
 }
diff --git a/refs.c b/refs.c
@@ -1863,10 +1863,13 @@ static void register_ref_store_map(struct hashmap *map,
 				   struct ref_store *refs,
 				   const char *name)
 {
+	struct ref_store_hash_entry *entry;
+
 	if (!map->tablesize)
 		hashmap_init(map, ref_store_hash_cmp, NULL, 0);
 
-	if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs)))
+	entry = alloc_ref_store_hash_entry(name, refs);
+	if (hashmap_put(map, &entry->ent))
 		BUG("%s ref_store '%s' initialized twice", type, name);
 }
 
diff --git a/remote.c b/remote.c
@@ -159,7 +159,7 @@ static struct remote *make_remote(const char *name, int len)
 	remotes[remotes_nr++] = ret;
 
 	hashmap_entry_init(&ret->ent, lookup_entry.hash);
-	replaced = hashmap_put(&remotes_hash, ret);
+	replaced = hashmap_put(&remotes_hash, &ret->ent);
 	assert(replaced == NULL);  /* no previous entry overwritten */
 	return ret;
 }
diff --git a/revision.c b/revision.c
@@ -153,7 +153,7 @@ static void paths_and_oids_insert(struct hashmap *map,
 		hashmap_entry_init(&entry->ent, hash);
 		entry->path = xstrdup(key.path);
 		oidset_init(&entry->trees, 16);
-		hashmap_put(map, entry);
+		hashmap_put(map, &entry->ent);
 	}
 
 	oidset_insert(&entry->trees, oid);
diff --git a/sequencer.c b/sequencer.c
@@ -5254,7 +5254,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 			entry->i = i;
 			hashmap_entry_init(&entry->entry,
 					strhash(entry->subject));
-			hashmap_put(&subject2item, entry);
+			hashmap_put(&subject2item, &entry->entry);
 		}
 	}
 
diff --git a/submodule-config.c b/submodule-config.c
@@ -125,7 +125,7 @@ static void cache_put_path(struct submodule_cache *cache,
 	struct submodule_entry *e = xmalloc(sizeof(*e));
 	hashmap_entry_init(&e->ent, hash);
 	e->config = submodule;
-	hashmap_put(&cache->for_path, e);
+	hashmap_put(&cache->for_path, &e->ent);
 }
 
 static void cache_remove_path(struct submodule_cache *cache,
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
@@ -187,7 +187,7 @@ int cmd__hashmap(int argc, const char **argv)
 			entry = alloc_test_entry(hash, p1, p2);
 
 			/* add / replace entry */
-			entry = hashmap_put(&map, entry);
+			entry = hashmap_put(&map, &entry->ent);
 
 			/* print and free replaced entry, if any */
 			puts(entry ? get_value(entry) : "NULL");

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ static const void anonymize_mem(struct hashmap map,`
`160`	`160`	`ret->orig_len = *len;`
`161`	`161`	`ret->anon = generate(orig, len);`
`162`	`162`	`ret->anon_len = *len;`
`163`		`- hashmap_put(map, ret);`
	`163`	`+ hashmap_put(map, &ret->hash);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`*len = ret->anon_len;`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ void hashmap_remove(struct hashmap map, const struct hashmap_entry *key,`
`241`	`241`	`return old;`
`242`	`242`	`}`
`243`	`243`
`244`		`-void hashmap_put(struct hashmap map, void *entry)`
	`244`	`+void hashmap_put(struct hashmap map, struct hashmap_entry *entry)`
`245`	`245`	`{`
`246`	`246`	`struct hashmap_entry *old = hashmap_remove(map, entry, NULL);`
`247`	`247`	`hashmap_add(map, entry);`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,5 @@ void oidmap_put(struct oidmap map, void *entry)`
`51`	`51`	`oidmap_init(map, 0);`
`52`	`52`
`53`	`53`	`hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));`
`54`		`- return hashmap_put(&map->map, to_put);`
	`54`	`+ return hashmap_put(&map->map, &to_put->internal_entry);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1863,10 +1863,13 @@ static void register_ref_store_map(struct hashmap *map,`
`1863`	`1863`	`struct ref_store *refs,`
`1864`	`1864`	`const char *name)`
`1865`	`1865`	`{`
	`1866`	`+ struct ref_store_hash_entry *entry;`
	`1867`	`+`
`1866`	`1868`	`if (!map->tablesize)`
`1867`	`1869`	`hashmap_init(map, ref_store_hash_cmp, NULL, 0);`
`1868`	`1870`
`1869`		`- if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs)))`
	`1871`	`+ entry = alloc_ref_store_hash_entry(name, refs);`
	`1872`	`+ if (hashmap_put(map, &entry->ent))`
`1870`	`1873`	`BUG("%s ref_store '%s' initialized twice", type, name);`
`1871`	`1874`	`}`
`1872`	`1875`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ static struct remote make_remote(const char name, int len)`
`159`	`159`	`remotes[remotes_nr++] = ret;`
`160`	`160`
`161`	`161`	`hashmap_entry_init(&ret->ent, lookup_entry.hash);`
`162`		`- replaced = hashmap_put(&remotes_hash, ret);`
	`162`	`+ replaced = hashmap_put(&remotes_hash, &ret->ent);`
`163`	`163`	`assert(replaced == NULL); /* no previous entry overwritten */`
`164`	`164`	`return ret;`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ static void paths_and_oids_insert(struct hashmap *map,`
`153`	`153`	`hashmap_entry_init(&entry->ent, hash);`
`154`	`154`	`entry->path = xstrdup(key.path);`
`155`	`155`	`oidset_init(&entry->trees, 16);`
`156`		`- hashmap_put(map, entry);`
	`156`	`+ hashmap_put(map, &entry->ent);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`oidset_insert(&entry->trees, oid);`
Original file line number	Diff line number	Diff line change
`@@ -5254,7 +5254,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)`
`5254`	`5254`	`entry->i = i;`
`5255`	`5255`	`hashmap_entry_init(&entry->entry,`
`5256`	`5256`	`strhash(entry->subject));`
`5257`		`- hashmap_put(&subject2item, entry);`
	`5257`	`+ hashmap_put(&subject2item, &entry->entry);`
`5258`	`5258`	`}`
`5259`	`5259`	`}`
`5260`	`5260`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ static void cache_put_path(struct submodule_cache *cache,`
`125`	`125`	`struct submodule_entry e = xmalloc(sizeof(e));`
`126`	`126`	`hashmap_entry_init(&e->ent, hash);`
`127`	`127`	`e->config = submodule;`
`128`		`- hashmap_put(&cache->for_path, e);`
	`128`	`+ hashmap_put(&cache->for_path, &e->ent);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`static void cache_remove_path(struct submodule_cache *cache,`