Mercurial > hg > octave-lojdl > gnulib-hg
changeset 1848:afab915d3e18
(human_readable): Allow from_block_size to be zero.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Mon, 17 May 1999 13:03:46 +0000 |
| parents | 7fa74c1b9f47 |
| children | d591bbc0e8aa |
| files | lib/human.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/human.c +++ b/lib/human.c @@ -76,7 +76,7 @@ /* Convert N to a human readable format in BUF. N is expressed in units of FROM_BLOCK_SIZE. FROM_BLOCK_SIZE must - be positive. + be nonnegative. If OUTPUT_BLOCK_SIZE is positive, use units of OUTPUT_BLOCK_SIZE in the output number. OUTPUT_BLOCK_SIZE must be a multiple of @@ -101,7 +101,7 @@ uintmax_t amt; int base; int to_block_size; - int tenths; + int tenths = 0; int power; char *p; @@ -109,7 +109,7 @@ 1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05; 2 means adjusted N == AMT.TENTHS + 0.05; 3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1. */ - int rounding; + int rounding = 0; if (output_block_size < 0) { @@ -136,7 +136,6 @@ { int multiplier = from_block_size / to_block_size; amt = n * multiplier; - tenths = rounding = 0; if (amt / multiplier != n) { @@ -172,6 +171,8 @@ return buf; } } + else if (from_block_size == 0) + amt = 0; else { int divisor = to_block_size / from_block_size;