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

blame: inline one-line function into its lone caller

Browse Source 
As of 25ed3412 (Refactor parse_loc; 2013-03-28),
blame.c:prepare_blame_range() became effectively a one-line function
which merely passes its arguments along to another function. This
indirection does not bring clarity to the code. Simplify by inlining
prepare_blame_range() into its lone caller.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2013-08-06 09:59:37 -04:00 committed by Junio C Hamano
parent c0babbe695
commit 753935749f
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/blame.c
View File

@ -1937,18 +1937,6 @@ static const char *add_prefix(const char *prefix, const char *path)
return prefix_path(prefix, prefix ? strlen(prefix) : 0, path); return prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
} }
/*
* Parsing of -L option
*/
static void prepare_blame_range(struct scoreboard *sb,
const char *bottomtop,
long lno,
long *bottom, long *top)
{
if (parse_range_arg(bottomtop, nth_line_cb, sb, lno, bottom, top, sb->path))
usage(blame_usage);
}
static int git_blame_config(const char *var, const char *value, void *cb) static int git_blame_config(const char *var, const char *value, void *cb)
{ {
if (!strcmp(var, "blame.showroot")) { if (!strcmp(var, "blame.showroot")) {
@ -2493,8 +2481,9 @@ parse_done:
lno = prepare_lines(&sb); lno = prepare_lines(&sb);
bottom = top = 0; bottom = top = 0;
if (bottomtop) if (bottomtop && parse_range_arg(bottomtop, nth_line_cb, &sb, lno,
prepare_blame_range(&sb, bottomtop, lno, &bottom, &top); &bottom, &top, sb.path))
usage(blame_usage);
if (lno < top || ((lno || bottom) && lno < bottom)) if (lno < top || ((lno || bottom) && lno < bottom))
die("file %s has only %lu lines", path, lno); die("file %s has only %lu lines", path, lno);
if (bottom < 1) if (bottom < 1)