averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch-ids.c: drop hashmap_cmp_fn cast

Browse Source 
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2017-06-30 17:28:34 -07:00
committed by Junio C Hamano
parent 9ab42958f6
commit 8d0017daa1
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patch-ids.c
View File

@@ -35,11 +35,16 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
* the side of safety. The actual value being negative does not have * the side of safety. The actual value being negative does not have
* any significance; only that it is non-zero matters. * any significance; only that it is non-zero matters.
*/ */
static int patch_id_cmp(struct diff_options *opt, static int patch_id_cmp(const void *cmpfn_data,
struct patch_id *a, const void *entry,
struct patch_id *b, const void *entry_or_key,
const void *unused_keydata) 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;
if (is_null_oid(&a->patch_id) && if (is_null_oid(&a->patch_id) &&
commit_patch_id(a->commit, opt, &a->patch_id, 0)) commit_patch_id(a->commit, opt, &a->patch_id, 0))
return error("Could not get patch ID for %s", return error("Could not get patch ID for %s",
@@ -58,8 +63,7 @@ int init_patch_ids(struct patch_ids *ids)
ids->diffopts.detect_rename = 0; ids->diffopts.detect_rename = 0;
DIFF_OPT_SET(&ids->diffopts, RECURSIVE); DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
diff_setup_done(&ids->diffopts); diff_setup_done(&ids->diffopts);
hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp, hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 256);
&ids->diffopts, 256);
return 0; return 0;
} }