blame: simplify 'setup_blame_bloom_data' interface
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>
Philippe Blain committed
Nov 1, 2020 at 17:28 UTC
3af31e87868d46363359148db5243f46d49029e8
3 files changed
+4
-6
blame.c
+2
-3
@@ -2887,8 +2887,7 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head,
2887
return new_head;
2888
}
2889
2890
-void setup_blame_bloom_data(struct blame_scoreboard *sb,
2891
- const char *path)
2890
+void setup_blame_bloom_data(struct blame_scoreboard *sb)
2891
{
2892
struct blame_bloom_data *bd;
2893
struct bloom_filter_settings *bs;
@@ -2908,7 +2907,7 @@ void setup_blame_bloom_data(struct blame_scoreboard *sb,
2907
bd->nr = 0;
2908
ALLOC_ARRAY(bd->keys, bd->alloc);
2909
2911
- add_bloom_key(bd, path);
2910
+ add_bloom_key(bd, sb->path);
2911
2912
sb->bloom_data = bd;
2913
}
blame.h
+1
-2
@@ -182,8 +182,7 @@ const char *blame_nth_line(struct blame_scoreboard *sb, long lno);
182
void init_scoreboard(struct blame_scoreboard *sb);
183
void setup_scoreboard(struct blame_scoreboard *sb,
184
struct blame_origin **orig);
185
-void setup_blame_bloom_data(struct blame_scoreboard *sb,
186
- const char *path);
185
+void setup_blame_bloom_data(struct blame_scoreboard *sb);
186
void cleanup_scoreboard(struct blame_scoreboard *sb);
187
188
struct blame_entry *blame_entry_prepend(struct blame_entry *head,
builtin/blame.c
+1
-1
@@ -1094,7 +1094,7 @@ parse_done:
1094
* for copies.
1095
*/
1096
if (!(opt & PICKAXE_BLAME_COPY))
1097
- setup_blame_bloom_data(&sb, path);
1097
+ setup_blame_bloom_data(&sb);
1098
1099
lno = sb.num_lines;
1100