From ec7ff5ba272b565ed093a98dc13dd5cd26aeac92 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Feb 2012 15:16:20 +0100 Subject: [PATCH] make lineno_width() from blame reusable for others MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit builtin/blame.c has a helper function to compute how many columns we need to show a line-number, whose implementation is reusable as a more generic helper function to count the number of columns necessary to show any cardinal number. Rename it to decimal_width(), move it to pager.c and export it for use by future callers. Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Junio C Hamano --- builtin/blame.c | 18 +++--------------- cache.h | 1 + pager.c | 12 ++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 5a67c202f..f028e8aec 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1828,18 +1828,6 @@ static int read_ancestry(const char *graft_file) return 0; } -/* - * How many columns do we need to show line numbers in decimal? - */ -static int lineno_width(int lines) -{ - int i, width; - - for (width = 1, i = 10; i <= lines; width++) - i *= 10; - return width; -} - /* * How many columns do we need to show line numbers, authors, * and filenames? @@ -1880,9 +1868,9 @@ static void find_alignment(struct scoreboard *sb, int *option) if (largest_score < ent_score(sb, e)) largest_score = ent_score(sb, e); } - max_orig_digits = lineno_width(longest_src_lines); - max_digits = lineno_width(longest_dst_lines); - max_score_digits = lineno_width(largest_score); + max_orig_digits = decimal_width(longest_src_lines); + max_digits = decimal_width(longest_dst_lines); + max_score_digits = decimal_width(largest_score); } /* diff --git a/cache.h b/cache.h index 9bd8c2d06..24732e6ca 100644 --- a/cache.h +++ b/cache.h @@ -1176,6 +1176,7 @@ extern void setup_pager(void); extern const char *pager_program; extern int pager_in_use(void); extern int pager_use_color; +extern int decimal_width(int); extern const char *editor_program; extern const char *askpass_program; diff --git a/pager.c b/pager.c index 975955ba8..96c07babb 100644 --- a/pager.c +++ b/pager.c @@ -110,3 +110,15 @@ int pager_in_use(void) env = getenv("GIT_PAGER_IN_USE"); return env ? git_config_bool("GIT_PAGER_IN_USE", env) : 0; } + +/* + * How many columns do we need to show this number in decimal? + */ +int decimal_width(int number) +{ + int i, width; + + for (width = 1, i = 10; i <= number; width++) + i *= 10; + return width; +} -- 2.30.2