hashmap_cmp_fn takes hashmap_entry params

[thirdparty/git.git] / patch-ids.c

diff --git a/patch-ids.c b/patch-ids.c
index 176c47d9673b07842a2dfe21dbed4d81ebd62a26..75f8c9f1a11e05e8cd6145241178d3b0cae62e40 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -36,14 +36,16 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
  * any significance; only that it is non-zero matters.
  */
 static int patch_id_neq(const void *cmpfn_data,
-                       const void *entry,
-                       const void *entry_or_key,
+                       const struct hashmap_entry *eptr,
+                       const struct hashmap_entry *entry_or_key,
                        const void *unused_keydata)
 {
        /* NEEDSWORK: const correctness? */
        struct diff_options *opt = (void *)cmpfn_data;
-       struct patch_id *a = (void *)entry;
-       struct patch_id *b = (void *)entry_or_key;
+       struct patch_id *a, *b;
+
+       a = container_of(eptr, struct patch_id, ent);
+       b = container_of(entry_or_key, struct patch_id, ent);
 
        if (is_null_oid(&a->patch_id) &&
            commit_patch_id(a->commit, opt, &a->patch_id, 0, 0))