summaryrefslogtreecommitdiff
path: root/name-hash.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-07-01 00:28:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-05 20:53:12 (GMT)
commit56a14ea7acbc1b22e92b0ea8ea0b8ed5c7e4efc2 (patch)
treed6e7aa1120a63bcb1dd1f7878fa10254319a7ba2 /name-hash.c
parent152cbdc64e0c8d07adbd63f029f8fa5bb7c45ddf (diff)
downloadgit-56a14ea7acbc1b22e92b0ea8ea0b8ed5c7e4efc2.zip
git-56a14ea7acbc1b22e92b0ea8ea0b8ed5c7e4efc2.tar.gz
git-56a14ea7acbc1b22e92b0ea8ea0b8ed5c7e4efc2.tar.bz2
name-hash.c: drop hashmap_cmp_fn cast
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'name-hash.c')
-rw-r--r--name-hash.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/name-hash.c b/name-hash.c
index 0e10f3e..bd8dc7a 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -17,10 +17,14 @@ struct dir_entry {
};
static int dir_entry_cmp(const void *unused_cmp_data,
- const struct dir_entry *e1,
- const struct dir_entry *e2,
- const char *name)
+ const void *entry,
+ const void *entry_or_key,
+ const void *keydata)
{
+ const struct dir_entry *e1 = entry;
+ const struct dir_entry *e2 = entry_or_key;
+ const char *name = keydata;
+
return e1->namelen != e2->namelen || strncasecmp(e1->name,
name ? name : e2->name, e1->namelen);
}
@@ -110,10 +114,12 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
}
static int cache_entry_cmp(const void *unused_cmp_data,
- const struct cache_entry *ce1,
- const struct cache_entry *ce2,
+ const void *entry,
+ const void *entry_or_key,
const void *remove)
{
+ const struct cache_entry *ce1 = entry;
+ const struct cache_entry *ce2 = entry_or_key;
/*
* For remove_name_hash, find the exact entry (pointer equality); for
* index_file_exists, find all entries with matching hash code and
@@ -574,10 +580,8 @@ static void lazy_init_name_hash(struct index_state *istate)
{
if (istate->name_hash_initialized)
return;
- hashmap_init(&istate->name_hash, (hashmap_cmp_fn) cache_entry_cmp,
- NULL, istate->cache_nr);
- hashmap_init(&istate->dir_hash, (hashmap_cmp_fn) dir_entry_cmp,
- NULL, istate->cache_nr);
+ hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
+ hashmap_init(&istate->dir_hash, dir_entry_cmp, NULL, istate->cache_nr);
if (lookup_lazy_params(istate)) {
hashmap_disallow_rehash(&istate->dir_hash, 1);