Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a fifth "divisor" argument to humanize_number; suitable values are

Browse Source 
either 1024 or 1000.
Needed because frequencies use decimal rather than power-of-two SI
prefixes.
This commit is contained in:
sommerfeld 2000-02-20 19:32:28 +00:00
parent 08f1ee0d30
commit cd14e5fa0c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_subr.c,v 1.57 2000/02/13 04:57:44 oster Exp $ */
/* $NetBSD: kern_subr.c,v 1.58 2000/02/20 19:32:30 sommerfeld Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -1077,11 +1077,12 @@ getstr(cp, size)
* 252215296 `240 MB'
*/
int
humanize_number(buf, len, bytes, suffix)
humanize_number(buf, len, bytes, suffix, divisor)
char *buf;
size_t len;
u_int64_t bytes;
const char *suffix;
int divisor;
{
/* prefixes are: (none), Kilo, Mega, Giga, Tera, Peta, Exa */
static const char prefixes[] = " KMGTPE";
@ -1103,7 +1104,7 @@ humanize_number(buf, len, bytes, suffix)
for (i = 0; i < len - suffixlen - 3; i++)
max *= 10;
for (i = 0; bytes >= max && i < sizeof(prefixes); i++)
bytes /= 1024;
bytes /= divisor;
r = snprintf(buf, len, "%qu%s%c%s", (unsigned long long)bytes,
i == 0 ? "" : " ", prefixes[i], suffix);
@ -1120,7 +1121,7 @@ format_bytes(buf, len, bytes)
int rv;
size_t nlen;
rv = humanize_number(buf, len, bytes, "B");
rv = humanize_number(buf, len, bytes, "B", 1024);
if (rv != -1) {
/* nuke the trailing ` B' if it exists */
nlen = strlen(buf) - 2;

4
sys/sys/systm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: systm.h,v 1.102 2000/02/03 22:44:11 cgd Exp $ */
/* $NetBSD: systm.h,v 1.103 2000/02/20 19:32:28 sommerfeld Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@ -186,7 +186,7 @@ void ttyprintf __P((struct tty *, const char *, ...))
char *bitmask_snprintf __P((u_quad_t, const char *, char *, size_t));
int humanize_number __P((char *, size_t, u_int64_t, const char *));
int humanize_number __P((char *, size_t, u_int64_t, const char *, int));
int format_bytes __P((char *, size_t, u_int64_t));
void tablefull __P((const char *));