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

Merge branch 'zj/decimal-width'

Browse Source 
* zj/decimal-width:
  make lineno_width() from blame reusable for others

Conflicts:
	cache.h
	pager.c
This commit is contained in:
Junio C Hamano 2012-02-20 00:15:11 -08:00
commit 4d9e079e82
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/blame.c
View File

@ -1828,18 +1828,6 @@ static int read_ancestry(const char *graft_file)
return 0; 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, * How many columns do we need to show line numbers, authors,
* and filenames? * and filenames?
@ -1880,9 +1868,9 @@ static void find_alignment(struct scoreboard *sb, int *option)
if (largest_score < ent_score(sb, e)) if (largest_score < ent_score(sb, e))
largest_score = ent_score(sb, e); largest_score = ent_score(sb, e);
} }
max_orig_digits = lineno_width(longest_src_lines); max_orig_digits = decimal_width(longest_src_lines);
max_digits = lineno_width(longest_dst_lines); max_digits = decimal_width(longest_dst_lines);
max_score_digits = lineno_width(largest_score); max_score_digits = decimal_width(largest_score);
} }
/* /*

1
cache.h
View File

@ -1178,6 +1178,7 @@ extern const char *pager_program;
extern int pager_in_use(void); extern int pager_in_use(void);
extern int pager_use_color; extern int pager_use_color;
extern int term_columns(void); extern int term_columns(void);
extern int decimal_width(int);
extern const char *editor_program; extern const char *editor_program;
extern const char *askpass_program; extern const char *askpass_program;

12
pager.c
View File

@ -147,3 +147,15 @@ int term_columns(void)
return term_columns_at_startup; return term_columns_at_startup;
} }
/*
* 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;
}