From 753935749f21b10b306bc81559bba2912a7128a6 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 6 Aug 2013 09:59:37 -0400 Subject: [PATCH] blame: inline one-line function into its lone caller 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 Signed-off-by: Junio C Hamano --- builtin/blame.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index e70b089a67..9db01b0172 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1937,18 +1937,6 @@ static const char *add_prefix(const char *prefix, const char *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) { if (!strcmp(var, "blame.showroot")) { @@ -2493,8 +2481,9 @@ parse_done: lno = prepare_lines(&sb); bottom = top = 0; - if (bottomtop) - prepare_blame_range(&sb, bottomtop, lno, &bottom, &top); + if (bottomtop && parse_range_arg(bottomtop, nth_line_cb, &sb, lno, + &bottom, &top, sb.path)) + usage(blame_usage); if (lno < top || ((lno || bottom) && lno < bottom)) die("file %s has only %lu lines", path, lno); if (bottom < 1) -- 2.11.4.GIT