diff options
| -rw-r--r-- | convert.c | 3 | ||||
| -rw-r--r-- | sub-process.c | 7 | ||||
| -rw-r--r-- | sub-process.h | 4 |
3 files changed, 8 insertions, 6 deletions
@@ -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 index a3cfab1a9d..6cbffa4406 100644 --- 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 index 96a2cca360..8cd07a59ab 100644 --- 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); |