oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

roken/parse_bytes: fix test for >= terabyte units on 32 bit systems

Browse Source 
On 32 bit systems, sizeof(ssize_t) and sizeof(unsigned long aka UL) is
32 bits which is not able to hold the value of a terabyte.
This commit is contained in:
Robert Manner
2022-11-08 14:47:40 +01:00
committed by Nico Williams
parent 997916e3f6
commit 65e5b0ab79
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1/check-gen.c
View File

@@ -2162,9 +2162,9 @@ test_default(void)
}; };
TESTDefault values[] = { TESTDefault values[] = {
{ "Heimdal", 8, 9223372036854775807, 1 }, { "Heimdal", 8, 9223372036854775807LL, 1 },
{ "heimdal", 7, 2147483647, 0 }, { "heimdal", 7, 2147483647, 0 },
{ "Heimdal", 7, 9223372036854775807, 0 }, { "Heimdal", 7, 9223372036854775807LL, 0 },
{ "heimdal", 8, 2147483647, 1 }, { "heimdal", 8, 2147483647, 1 },
}; };
int i, ret; int i, ret;

6
lib/roken/parse_bytes-test.c
View File

@@ -38,7 +38,7 @@
static struct testcase { static struct testcase {
int canonicalp; int canonicalp;
ssize_t val; int64_t val;
const char *def_unit; const char *def_unit;
const char *str; const char *str;
} tests[] = { } tests[] = {
@@ -52,7 +52,7 @@ static struct testcase {
{1, 1024 * 1024, NULL, "1 megabyte"}, {1, 1024 * 1024, NULL, "1 megabyte"},
{0, 1025, NULL, "1 kilobyte 1"}, {0, 1025, NULL, "1 kilobyte 1"},
{1, 1025, NULL, "1 kilobyte 1 byte"}, {1, 1025, NULL, "1 kilobyte 1 byte"},
{1, 1024UL * 1024 * 1024 * 1024, NULL, "1 terabyte"}, {1, 1024ULL * 1024 * 1024 * 1024, NULL, "1 terabyte"},
}; };
int int
@@ -63,7 +63,7 @@ main(int argc, char **argv)
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); ++i) { for (i = 0; i < sizeof(tests)/sizeof(tests[0]); ++i) {
char buf[256]; char buf[256];
ssize_t val = parse_bytes (tests[i].str, tests[i].def_unit); int64_t val = parse_bytes (tests[i].str, tests[i].def_unit);
if (val != tests[i].val) { if (val != tests[i].val) {
printf ("parse_bytes (%s, %s) = %lld != %lld\n", printf ("parse_bytes (%s, %s) = %lld != %lld\n",

18
lib/roken/parse_bytes.c
View File

@@ -37,10 +37,10 @@
#include "parse_bytes.h" #include "parse_bytes.h"
static struct units bytes_units[] = { static struct units bytes_units[] = {
{ "petabyte", 1024UL * 1024 * 1024 * 1024 * 1024 }, { "petabyte", 1024ULL * 1024 * 1024 * 1024 * 1024 },
{ "PB", 1024UL * 1024 * 1024 * 1024 * 1024 }, { "PB", 1024ULL * 1024 * 1024 * 1024 * 1024 },
{ "terabyte", 1024UL * 1024 * 1024 * 1024 }, { "terabyte", 1024ULL * 1024 * 1024 * 1024 },
{ "TB", 1024UL * 1024 * 1024 * 1024 }, { "TB", 1024ULL * 1024 * 1024 * 1024 },
{ "gigabyte", 1024 * 1024 * 1024 }, { "gigabyte", 1024 * 1024 * 1024 },
{ "gbyte", 1024 * 1024 * 1024 }, { "gbyte", 1024 * 1024 * 1024 },
{ "GB", 1024 * 1024 * 1024 }, { "GB", 1024 * 1024 * 1024 },
@@ -54,28 +54,28 @@ static struct units bytes_units[] = {
}; };
static struct units bytes_short_units[] = { static struct units bytes_short_units[] = {
{ "PB", 1024UL * 1024 * 1024 * 1024 * 1024 }, { "PB", 1024ULL * 1024 * 1024 * 1024 * 1024 },
{ "TB", 1024UL * 1024 * 1024 * 1024 }, { "TB", 1024ULL * 1024 * 1024 * 1024 },
{ "GB", 1024 * 1024 * 1024 }, { "GB", 1024 * 1024 * 1024 },
{ "MB", 1024 * 1024 }, { "MB", 1024 * 1024 },
{ "KB", 1024 }, { "KB", 1024 },
{ NULL, 0 } { NULL, 0 }
}; };
ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int64_t ROKEN_LIB_CALL
parse_bytes(const char *s, const char *def_unit) parse_bytes(const char *s, const char *def_unit)
{ {
return parse_units (s, bytes_units, def_unit); return parse_units (s, bytes_units, def_unit);
} }
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
unparse_bytes(ssize_t t, char *s, size_t len) unparse_bytes(int64_t t, char *s, size_t len)
{ {
return unparse_units (t, bytes_units, s, len); return unparse_units (t, bytes_units, s, len);
} }
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
unparse_bytes_short (ssize_t t, char *s, size_t len) unparse_bytes_short (int64_t t, char *s, size_t len)
{ {
return unparse_units_approx (t, bytes_short_units, s, len); return unparse_units_approx (t, bytes_short_units, s, len);
} }

6
lib/roken/parse_bytes.h
View File

@@ -38,13 +38,13 @@
#include <roken.h> #include <roken.h>
ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int64_t ROKEN_LIB_CALL
parse_bytes(const char *s, const char *def_unit); parse_bytes(const char *s, const char *def_unit);
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
unparse_bytes(ssize_t t, char *s, size_t len); unparse_bytes(int64_t t, char *s, size_t len);
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
unparse_bytes_short(ssize_t t, char *s, size_t len); unparse_bytes_short(int64_t t, char *s, size_t len);
#endif /* __PARSE_BYTES_H__ */ #endif /* __PARSE_BYTES_H__ */