diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:02 -0800 |
commit | ca00db08da414b3f6bd9481a51fdbb4b6836719c (patch) | |
tree | 52f110cfd65111f55e667bccc2652ea57c7c2e91 /pager.c | |
parent | de15bdb0583a1a65bf1bab47b7bec9bdc03f727a (diff) | |
parent | d306f3d3513c62342fec4e31457766f2473f9e9a (diff) | |
download | git-ca00db08da414b3f6bd9481a51fdbb4b6836719c.tar.gz |
Merge branch 'jk/decimal-width-for-uintmax'
We didn't format an integer that wouldn't fit in "int" but in
"uintmax_t" correctly.
* jk/decimal-width-for-uintmax:
decimal_width: avoid integer overflow
Diffstat (limited to 'pager.c')
-rw-r--r-- | pager.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -133,12 +133,12 @@ int term_columns(void) /* * How many columns do we need to show this number in decimal? */ -int decimal_width(int number) +int decimal_width(uintmax_t number) { - int i, width; + int width; - for (width = 1, i = 10; i <= number; width++) - i *= 10; + for (width = 1; number >= 10; width++) + number /= 10; return width; } |