hashmap_get_next takes "const struct hashmap_entry *"

Eric Wong · gitster · commit f6eb6bdcf271 · 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/diff.c b/diff.c
@@ -1036,7 +1036,7 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o,
 	int i;
 	char *got_match = xcalloc(1, pmb_nr);
 
-	for (; match; match = hashmap_get_next(hm, match)) {
+	for (; match; match = hashmap_get_next(hm, &match->ent)) {
 		for (i = 0; i < pmb_nr; i++) {
 			struct moved_entry *prev = pmb[i].match;
 			struct moved_entry *cur = (prev && prev->next_line) ?
@@ -1189,7 +1189,8 @@ static void mark_color_as_moved(struct diff_options *o,
 			 * The current line is the start of a new block.
 			 * Setup the set of potential blocks.
 			 */
-			for (; match; match = hashmap_get_next(hm, match)) {
+			for (; match; match = hashmap_get_next(hm,
+								&match->ent)) {
 				ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
 				if (o->color_moved_ws_handling &
 				    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
diff --git a/diffcore-rename.c b/diffcore-rename.c
@@ -285,7 +285,7 @@ static int find_identical_files(struct hashmap *srcs,
 	p = hashmap_get_from_hash(srcs,
 				  hash_filespec(options->repo, target),
 				  NULL);
-	for (; p; p = hashmap_get_next(srcs, p)) {
+	for (; p; p = hashmap_get_next(srcs, &p->entry)) {
 		int score;
 		struct diff_filespec *source = p->filespec;
 
diff --git a/hashmap.c b/hashmap.c
@@ -191,9 +191,10 @@ void *hashmap_get(const struct hashmap *map, const void *key, const void *keydat
 	return *find_entry_ptr(map, key, keydata);
 }
 
-void *hashmap_get_next(const struct hashmap *map, const void *entry)
+void *hashmap_get_next(const struct hashmap *map,
+			const struct hashmap_entry *entry)
 {
-	struct hashmap_entry *e = ((struct hashmap_entry *) entry)->next;
+	struct hashmap_entry *e = entry->next;
 	for (; e; e = e->next)
 		if (entry_equals(map, entry, e, NULL))
 			return e;
diff --git a/hashmap.h b/hashmap.h
@@ -318,7 +318,8 @@ static inline void *hashmap_get_from_hash(const struct hashmap *map,
  * `entry` is the hashmap_entry to start the search from, obtained via a previous
  * call to `hashmap_get` or `hashmap_get_next`.
  */
-void *hashmap_get_next(const struct hashmap *map, const void *entry);
+void *hashmap_get_next(const struct hashmap *map,
+			const struct hashmap_entry *entry);
 
 /*
  * Adds a hashmap entry. This allows to add duplicate entries (i.e.
diff --git a/name-hash.c b/name-hash.c
@@ -710,7 +710,7 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 	while (ce) {
 		if (same_name(ce, name, namelen, icase))
 			return ce;
-		ce = hashmap_get_next(&istate->name_hash, ce);
+		ce = hashmap_get_next(&istate->name_hash, &ce->ent);
 	}
 	return NULL;
 }
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
@@ -203,7 +203,7 @@ int cmd__hashmap(int argc, const char **argv)
 				puts("NULL");
 			while (entry) {
 				puts(get_value(entry));
-				entry = hashmap_get_next(&map, entry);
+				entry = hashmap_get_next(&map, &entry->ent);
 			}
 
 		} else if (!strcmp("remove", cmd) && p1) {

Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,10 @@ void hashmap_get(const struct hashmap map, const void key, const void keydat`
`191`	`191`	`return *find_entry_ptr(map, key, keydata);`
`192`	`192`	`}`
`193`	`193`
`194`		`-void hashmap_get_next(const struct hashmap map, const void *entry)`
	`194`	`+void hashmap_get_next(const struct hashmap map,`
	`195`	`+ const struct hashmap_entry *entry)`
`195`	`196`	`{`
`196`		`- struct hashmap_entry e = ((struct hashmap_entry ) entry)->next;`
	`197`	`+ struct hashmap_entry *e = entry->next;`
`197`	`198`	`for (; e; e = e->next)`
`198`	`199`	`if (entry_equals(map, entry, e, NULL))`
`199`	`200`	`return e;`
Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ struct cache_entry index_file_exists(struct index_state istate, const char *na`
`710`	`710`	`while (ce) {`
`711`	`711`	`if (same_name(ce, name, namelen, icase))`
`712`	`712`	`return ce;`
`713`		`- ce = hashmap_get_next(&istate->name_hash, ce);`
	`713`	`+ ce = hashmap_get_next(&istate->name_hash, &ce->ent);`
`714`	`714`	`}`
`715`	`715`	`return NULL;`
`716`	`716`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ int cmd__hashmap(int argc, const char **argv)`
`203`	`203`	`puts("NULL");`
`204`	`204`	`while (entry) {`
`205`	`205`	`puts(get_value(entry));`
`206`		`- entry = hashmap_get_next(&map, entry);`
	`206`	`+ entry = hashmap_get_next(&map, &entry->ent);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`} else if (!strcmp("remove", cmd) && p1) {`