remote.c: drop hashmap_cmp_fn cast

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 60d004392109f1e39f0bf34578e195cdf3af1639..3efa35855824032d582e21f95d7a397e29dffb8f 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -134,10 +134,14 @@ struct remotes_hash_key {
 };
 
 static int remotes_hash_cmp(const void *unused_cmp_data,
 };
 
 static int remotes_hash_cmp(const void *unused_cmp_data,

-                           const struct remote *a,
-                           const struct remote *b,
-                           const struct remotes_hash_key *key)
+                           const void *entry,
+                           const void *entry_or_key,
+                           const void *keydata)

 {
 {

+       const struct remote *a = entry;
+       const struct remote *b = entry_or_key;
+       const struct remotes_hash_key *key = keydata;
+

        if (key)
                return strncmp(a->name, key->str, key->len) || a->name[key->len];
        else
        if (key)
                return strncmp(a->name, key->str, key->len) || a->name[key->len];
        else


@@ -147,7 +151,7 @@ static int remotes_hash_cmp(const void *unused_cmp_data,
 static inline void init_remotes_hash(void)
 {
        if (!remotes_hash.cmpfn)
 static inline void init_remotes_hash(void)
 {
        if (!remotes_hash.cmpfn)

-               hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, NULL, 0);
+               hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);

 }
 
 static struct remote *make_remote(const char *name, int len)
 }
 
 static struct remote *make_remote(const char *name, int len)