convert/sub-process: drop cast to hashmap_cmp_fn

stefanbeller · gitster · commit 9ab42958f6c1 · 2017-07-05T13:53:12.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/convert.c b/convert.c
@@ -583,8 +583,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 
 	if (!subprocess_map_initialized) {
 		subprocess_map_initialized = 1;
-		hashmap_init(&subprocess_map, (hashmap_cmp_fn) cmd2process_cmp,
-			     NULL, 0);
+		hashmap_init(&subprocess_map, cmd2process_cmp, NULL, 0);
 		entry = NULL;
 	} else {
 		entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);
diff --git a/sub-process.c b/sub-process.c
@@ -6,10 +6,13 @@
 #include "pkt-line.h"
 
 int cmd2process_cmp(const void *unused_cmp_data,
-		    const struct subprocess_entry *e1,
-		    const struct subprocess_entry *e2,
+		    const void *entry,
+		    const void *entry_or_key,
 		    const void *unused_keydata)
 {
+	const struct subprocess_entry *e1 = entry;
+	const struct subprocess_entry *e2 = entry_or_key;
+
 	return strcmp(e1->cmd, e2->cmd);
 }
 
diff --git a/sub-process.h b/sub-process.h
@@ -21,8 +21,8 @@ struct subprocess_entry {
 /* subprocess functions */
 
 extern int cmd2process_cmp(const void *unused_cmp_data,
-			   const struct subprocess_entry *e1,
-			   const struct subprocess_entry *e2,
+			   const void *e1,
+			   const void *e2,
 			   const void *unused_keydata);
 
 typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,13 @@`
`6`	`6`	`#include "pkt-line.h"`
`7`	`7`
`8`	`8`	`int cmd2process_cmp(const void *unused_cmp_data,`
`9`		`- const struct subprocess_entry *e1,`
`10`		`- const struct subprocess_entry *e2,`
	`9`	`+ const void *entry,`
	`10`	`+ const void *entry_or_key,`
`11`	`11`	`const void *unused_keydata)`
`12`	`12`	`{`
	`13`	`+ const struct subprocess_entry *e1 = entry;`
	`14`	`+ const struct subprocess_entry *e2 = entry_or_key;`
	`15`	`+`
`13`	`16`	`return strcmp(e1->cmd, e2->cmd);`
`14`	`17`	`}`
`15`	`18`