diff options
| author | Stefan Beller <sbeller@google.com> | 2017-07-01 00:28:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-05 20:53:12 (GMT) |
| commit | 8d0017daa1dcd596a1412700aee378c27238319e (patch) | |
| tree | 640eae34a43033d4819caa46c94748cc1e0e781e /patch-ids.c | |
| parent | 9ab42958f6c103fc75fcf2598ccb18e2c493c0fb (diff) | |
| download | git-8d0017daa1dcd596a1412700aee378c27238319e.zip git-8d0017daa1dcd596a1412700aee378c27238319e.tar.gz git-8d0017daa1dcd596a1412700aee378c27238319e.tar.bz2 | |
patch-ids.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 'patch-ids.c')
| -rw-r--r-- | patch-ids.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/patch-ids.c b/patch-ids.c index b4166b0..7a583b3 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -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 * any significance; only that it is non-zero matters. */ -static int patch_id_cmp(struct diff_options *opt, - struct patch_id *a, - struct patch_id *b, +static int patch_id_cmp(const void *cmpfn_data, + const void *entry, + const void *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; + if (is_null_oid(&a->patch_id) && commit_patch_id(a->commit, opt, &a->patch_id, 0)) 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; DIFF_OPT_SET(&ids->diffopts, RECURSIVE); diff_setup_done(&ids->diffopts); - hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp, - &ids->diffopts, 256); + hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 256); return 0; } |