convert/sub-process: drop cast to hashmap_cmp_fn
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jun 30, 2017 at 17:28 UTC
9ab42958f6c103fc75fcf2598ccb18e2c493c0fb
3 files changed
+8
-6
convert.c
+1
-2
@@ -583,8 +583,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
583
584
if (!subprocess_map_initialized) {
585
subprocess_map_initialized = 1;
586
- hashmap_init(&subprocess_map, (hashmap_cmp_fn) cmd2process_cmp,
587
- NULL, 0);
586
+ hashmap_init(&subprocess_map, cmd2process_cmp, NULL, 0);
587
entry = NULL;
588
} else {
589
entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);
sub-process.c
+5
-2
@@ -6,10 +6,13 @@
6
#include "pkt-line.h"
7
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
const void *unused_keydata)
12
{
13
+ const struct subprocess_entry *e1 = entry;
14
+ const struct subprocess_entry *e2 = entry_or_key;
15
+
16
return strcmp(e1->cmd, e2->cmd);
17
}
18
sub-process.h
+2
-2
@@ -21,8 +21,8 @@ struct subprocess_entry {
21
/* subprocess functions */
22
23
extern int cmd2process_cmp(const void *unused_cmp_data,
24
- const struct subprocess_entry *e1,
25
- const struct subprocess_entry *e2,
24
+ const void *e1,
25
+ const void *e2,
26
const void *unused_keydata);
27
28
typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);