kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/describe: drop hashmap_cmp_fn cast 

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2017-06-30 17:28:31 -07:00 committed by Junio C Hamano
parent 7db316bcbe
commit 0068cede4a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/describe.c
View File

@ -55,10 +55,13 @@ static const char *prio_names[] = {
}; };


static int commit_name_cmp(const void *unused_cmp_data, static int commit_name_cmp(const void *unused_cmp_data,
const struct commit_name *cn1, const void *entry,
const struct commit_name *cn2, const void *entry_or_key,
const void *peeled) const void *peeled)
{ {
const struct commit_name *cn1 = entry;
const struct commit_name *cn2 = entry_or_key;

return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled); return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled);
} }


@ -503,7 +506,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
return cmd_name_rev(args.argc, args.argv, prefix); return cmd_name_rev(args.argc, args.argv, prefix);
} }


hashmap_init(&names, (hashmap_cmp_fn) commit_name_cmp, NULL, 0); hashmap_init(&names, commit_name_cmp, NULL, 0);
for_each_rawref(get_name, NULL); for_each_rawref(get_name, NULL);
if (!names.size && !always) if (!names.size && !always)
die(_("No names found, cannot describe anything.")); die(_("No names found, cannot describe anything."));