summaryrefslogtreecommitdiff
path: root/oidset.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-06-30 19:14:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-30 19:49:28 (GMT)
commit7663cdc86c860d5b5293a1dd4b0fb6c4e006d08e (patch)
tree19a347bfc7b3eb59f2f30c581c8408679001d764 /oidset.c
parente0aaa1b6532cfce93d87af9bc813fb2e7a7ce9d7 (diff)
downloadgit-7663cdc86c860d5b5293a1dd4b0fb6c4e006d08e.zip
git-7663cdc86c860d5b5293a1dd4b0fb6c4e006d08e.tar.gz
git-7663cdc86c860d5b5293a1dd4b0fb6c4e006d08e.tar.bz2
hashmap.h: compare function has access to a data field
When using the hashmap a common need is to have access to caller provided data in the compare function. A couple of times we abuse the keydata field to pass in the data needed. This happens for example in patch-ids.c. This patch changes the function signature of the compare function to have one more void pointer available. The pointer given for each invocation of the compare function must be defined in the init function of the hashmap and is just passed through. Documentation of this new feature is deferred to a later patch. This is a rather mechanical conversion, just adding the new pass-through parameter. However while at it improve the naming of the fields of all compare functions used by hashmaps by ensuring unused parameters are prefixed with 'unused_' and naming the parameters what they are (instead of 'unused' make it 'unused_keydata'). Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'oidset.c')
-rw-r--r--oidset.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/oidset.c b/oidset.c
index ac169f0..a6a08ba 100644
--- a/oidset.c
+++ b/oidset.c
@@ -6,7 +6,8 @@ struct oidset_entry {
struct object_id oid;
};
-static int oidset_hashcmp(const void *va, const void *vb,
+static int oidset_hashcmp(const void *unused_cmp_data,
+ const void *va, const void *vb,
const void *vkey)
{
const struct oidset_entry *a = va, *b = vb;
@@ -30,7 +31,7 @@ int oidset_insert(struct oidset *set, const struct object_id *oid)
struct oidset_entry *entry;
if (!set->map.cmpfn)
- hashmap_init(&set->map, oidset_hashcmp, 0);
+ hashmap_init(&set->map, oidset_hashcmp, NULL, 0);
if (oidset_contains(set, oid))
return 1;