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>

diff --git a/convert.c b/convert.c
index deaf0ba7b30ffa4e0003649985ef1594ee2ac049..04966c723c052d60c8f2954cfa1d7bab218e5b49 100644 (file)
--- 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;
 
        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);
                entry = NULL;
        } else {
                entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);

diff --git a/sub-process.c b/sub-process.c
index a3cfab1a9d1feb1fea3fbc9bb9dbe04a89b9c874..6cbffa44064f6e2040be496ad509a57db648e554 100644 (file)
--- a/sub-process.c
+++ b/sub-process.c
@@ -6,10 +6,13 @@
 #include "pkt-line.h"
 
 int cmd2process_cmp(const void *unused_cmp_data,
 #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 void *unused_keydata)
 {

+       const struct subprocess_entry *e1 = entry;
+       const struct subprocess_entry *e2 = entry_or_key;
+

        return strcmp(e1->cmd, e2->cmd);
 }
 
        return strcmp(e1->cmd, e2->cmd);
 }
 

diff --git a/sub-process.h b/sub-process.h
index 96a2cca360c5660fb8e72c684dc4c25e96ba0546..8cd07a59ab4344fdc9a5b35b201a075aa7c06423 100644 (file)
--- 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,
 /* 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);
                           const void *unused_keydata);
 
 typedef int(*subprocess_start_fn)(struct subprocess_entry *entry);