X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhuman.c;h=f7dcdfb2a890ba63acf4e5459d9310f416eb5c07;hb=a52b3661049d06e669e3038c613e62fe4c96b4ce;hp=37577234a1907cd67ce95cfd241152680e987214;hpb=96e78d1f64d7c8d2acc5ad27dc3e73b96ae80585;p=gnulib.git diff --git a/lib/human.c b/lib/human.c index 37577234a..f7dcdfb2a 100644 --- a/lib/human.c +++ b/lib/human.c @@ -1,5 +1,5 @@ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -158,7 +158,7 @@ human_readable (uintmax_t n, char *buf, e *= base; power++; } - while (e * base <= amt && power < sizeof suffixes - 1); + while (e * base <= damt && power < sizeof suffixes - 1); damt /= e; @@ -258,7 +258,7 @@ humblock (char const *spec, int *block_size) if (! spec && ! (spec = getenv ("BLOCK_SIZE"))) *block_size = getenv ("POSIXLY_CORRECT") ? 512 : DEFAULT_BLOCK_SIZE; - else if (0 <= (i = argmatch (spec, block_size_args))) + else if (0 <= (i = ARGMATCH (spec, block_size_args, block_size_types))) *block_size = block_size_types[i]; else {