Update to FreeBSD head 2017-06-01

Git mirror commit dfb26efac4ce9101dda240e94d9ab53f80a9e131.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-07 12:12:37 +02:00
parent a25e6a9d18
commit de261e0404
257 changed files with 3909 additions and 2604 deletions

View File

@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <locale.h>
#include <libutil.h>
static const int maxscale = 7;
static const int maxscale = 6;
int
humanize_number(char *buf, size_t len, int64_t quotient,
@@ -66,7 +66,7 @@ humanize_number(char *buf, size_t len, int64_t quotient,
return (-1);
if (scale < 0)
return (-1);
else if (scale >= maxscale &&
else if (scale > maxscale &&
((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0))
return (-1);
if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))