d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix definitions of kilobits etc.

Browse Source 
PR:		bin/106116
Nudged by:	Rostislav Krasny
MFC after:	3 days
This commit is contained in:
ru 2007-01-18 09:24:08 +00:00
parent d02694d662
commit a1f44261d4
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
usr.bin/systat/convtbl.c
View File

@ -33,15 +33,19 @@
#include <string.h> #include <string.h>
#include "convtbl.h" #include "convtbl.h"
#define BIT (8) #define BIT (8)
#define BYTE (1) #define BITS (1)
#define KILOBIT (1000LL)
#define MEGABIT (KILOBIT * 1000)
#define GIGABIT (MEGABIT * 1000)
#define TERABIT (GIGABIT * 1000)
#define BITS (1) #define BYTE (1)
#define BYTES (1) #define BYTES (1)
#define KILO (1024LL) #define KILOBYTE (1024LL)
#define MEGA (KILO * 1024) #define MEGABYTE (KILOBYTE * 1024)
#define GIGA (MEGA * 1024) #define GIGABYTE (MEGABYTE * 1024)
#define TERA (GIGA * 1024) #define TERABYTE (GIGABYTE * 1024)
struct convtbl { struct convtbl {
uintmax_t mul; uintmax_t mul;
@ -52,17 +56,17 @@ struct convtbl {
static struct convtbl convtbl[] = { static struct convtbl convtbl[] = {
/* mul, scale, str, name */ /* mul, scale, str, name */
[SC_BYTE] = { BYTE, BYTES, "B", "byte" }, [SC_BYTE] = { BYTE, BYTES, "B", "byte" },
[SC_KILOBYTE] = { BYTE, KILO, "KB", "kbyte" }, [SC_KILOBYTE] = { BYTE, KILOBYTE, "KB", "kbyte" },
[SC_MEGABYTE] = { BYTE, MEGA, "MB", "mbyte" }, [SC_MEGABYTE] = { BYTE, MEGABYTE, "MB", "mbyte" },
[SC_GIGABYTE] = { BYTE, GIGA, "GB", "gbyte" }, [SC_GIGABYTE] = { BYTE, GIGABYTE, "GB", "gbyte" },
[SC_TERABYTE] = { BYTE, TERA, "TB", "tbyte" }, [SC_TERABYTE] = { BYTE, TERABYTE, "TB", "tbyte" },
[SC_BIT] = { BIT, BITS, "b", "bit" }, [SC_BIT] = { BIT, BITS, "b", "bit" },
[SC_KILOBIT] = { BIT, KILO, "Kb", "kbit" }, [SC_KILOBIT] = { BIT, KILOBIT, "Kb", "kbit" },
[SC_MEGABIT] = { BIT, MEGA, "Mb", "mbit" }, [SC_MEGABIT] = { BIT, MEGABIT, "Mb", "mbit" },
[SC_GIGABIT] = { BIT, GIGA, "Gb", "gbit" }, [SC_GIGABIT] = { BIT, GIGABIT, "Gb", "gbit" },
[SC_TERABIT] = { BIT, TERA, "Tb", "tbit" }, [SC_TERABIT] = { BIT, TERABIT, "Tb", "tbit" },
[SC_AUTO] = { 0, 0, "", "auto" } [SC_AUTO] = { 0, 0, "", "auto" }
}; };
@ -85,7 +89,7 @@ get_tbl_ptr(const uintmax_t size, const int scale)
* index as the array index into the conversion table. * index as the array index into the conversion table.
*/ */
for (tmp = size, idx = SC_KILOBYTE; for (tmp = size, idx = SC_KILOBYTE;
tmp >= MEGA && idx < SC_BIT - 1; tmp >= MEGABYTE && idx < SC_BIT - 1;
tmp >>= 10, idx++); tmp >>= 10, idx++);
return (&convtbl[idx]); return (&convtbl[idx]);