undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: simplify 'setup_blame_bloom_data' interface

Browse Source 
The penultimate commit moved the initialization of 'sb.path' in
'builtin/blame.c::cmd_blame' before the call to
'blame.c::setup_blame_bloom_data'. Since 'cmd_blame' is the only caller
of 'setup_blame_bloom_data', it is now unnecessary for
'setup_blame_bloom_data' to receive 'path' as a separate argument, as
'sb.path' is already initialized.

Remove this argument from setup_blame_bloom_data's interface and use the
'path' field of the 'sb' 'struct blame_scoreboard' instead.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Philippe Blain 2020-11-01 17:28:47 +00:00 committed by Junio C Hamano
parent 88894aaeea
commit 3af31e8786
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blame.c
View File

@ -2887,8 +2887,7 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head,
return new_head; return new_head;
} }
void setup_blame_bloom_data(struct blame_scoreboard *sb, void setup_blame_bloom_data(struct blame_scoreboard *sb)
const char *path)
{ {
struct blame_bloom_data *bd; struct blame_bloom_data *bd;
struct bloom_filter_settings *bs; struct bloom_filter_settings *bs;
@ -2908,7 +2907,7 @@ void setup_blame_bloom_data(struct blame_scoreboard *sb,
bd->nr = 0; bd->nr = 0;
ALLOC_ARRAY(bd->keys, bd->alloc); ALLOC_ARRAY(bd->keys, bd->alloc);
add_bloom_key(bd, path); add_bloom_key(bd, sb->path);
sb->bloom_data = bd; sb->bloom_data = bd;
} }

3
blame.h
View File

@ -182,8 +182,7 @@ const char *blame_nth_line(struct blame_scoreboard *sb, long lno);
void init_scoreboard(struct blame_scoreboard *sb); void init_scoreboard(struct blame_scoreboard *sb);
void setup_scoreboard(struct blame_scoreboard *sb, void setup_scoreboard(struct blame_scoreboard *sb,
struct blame_origin **orig); struct blame_origin **orig);
void setup_blame_bloom_data(struct blame_scoreboard *sb, void setup_blame_bloom_data(struct blame_scoreboard *sb);
const char *path);
void cleanup_scoreboard(struct blame_scoreboard *sb); void cleanup_scoreboard(struct blame_scoreboard *sb);
struct blame_entry *blame_entry_prepend(struct blame_entry *head, struct blame_entry *blame_entry_prepend(struct blame_entry *head,

2
builtin/blame.c
View File

@ -1094,7 +1094,7 @@ parse_done:
* for copies. * for copies.
*/ */
if (!(opt & PICKAXE_BLAME_COPY)) if (!(opt & PICKAXE_BLAME_COPY))
setup_blame_bloom_data(&sb, path); setup_blame_bloom_data(&sb);
lno = sb.num_lines; lno = sb.num_lines;