提交 ee1df66f 编写于 作者: S Stefan Beller 提交者: Junio C Hamano

diff.c: adjust hash function signature to match hashmap expectation

This makes the follow up patch easier.
Signed-off-by: NStefan Beller <sbeller@google.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 3783aad4
...@@ -707,11 +707,15 @@ struct moved_entry { ...@@ -707,11 +707,15 @@ struct moved_entry {
struct moved_entry *next_line; struct moved_entry *next_line;
}; };
static int moved_entry_cmp(const struct diff_options *diffopt, static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
const struct moved_entry *a, const void *entry,
const struct moved_entry *b, const void *entry_or_key,
const void *keydata) const void *keydata)
{ {
const struct diff_options *diffopt = hashmap_cmp_fn_data;
const struct moved_entry *a = entry;
const struct moved_entry *b = entry_or_key;
return !xdiff_compare_lines(a->es->line, a->es->len, return !xdiff_compare_lines(a->es->line, a->es->len,
b->es->line, b->es->len, b->es->line, b->es->len,
diffopt->xdl_opts); diffopt->xdl_opts);
...@@ -5534,10 +5538,8 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o) ...@@ -5534,10 +5538,8 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
if (o->color_moved) { if (o->color_moved) {
struct hashmap add_lines, del_lines; struct hashmap add_lines, del_lines;
hashmap_init(&del_lines, hashmap_init(&del_lines, moved_entry_cmp, o, 0);
(hashmap_cmp_fn)moved_entry_cmp, o, 0); hashmap_init(&add_lines, moved_entry_cmp, o, 0);
hashmap_init(&add_lines,
(hashmap_cmp_fn)moved_entry_cmp, o, 0);
add_lines_to_move_detection(o, &add_lines, &del_lines); add_lines_to_move_detection(o, &add_lines, &del_lines);
mark_color_as_moved(o, &add_lines, &del_lines); mark_color_as_moved(o, &add_lines, &del_lines);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册