diff options
| author | Stefan Beller <sbeller@google.com> | 2017-07-01 02:28:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-05 22:53:12 +0200 |
| commit | 45dcb35f9a4755f3530fe9ec6a1622deeefe36bf (patch) | |
| tree | 04ed175c9945c9301eee56fa39a951466edb23e9 | |
| parent | patch-ids.c: drop hashmap_cmp_fn cast (diff) | |
| download | git-45dcb35f9a4755f3530fe9ec6a1622deeefe36bf.tar.xz git-45dcb35f9a4755f3530fe9ec6a1622deeefe36bf.zip | |
remote.c: drop hashmap_cmp_fn cast
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | remote.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -134,10 +134,14 @@ struct remotes_hash_key { }; 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 @@ -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) - 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) |