Michael Vogt
bc4dfc24a5
Lennart reminded me in [1] that we need to add assert() in functions that do pointer access. For the simple `*p` pointer dereferences we even have an automatic coccinelle script that ensures that as part of the automatic code checks. However for deref in the `p->` style this is not supported right now and adding it to coccinelle is hard because its too slow for this kind of check. So I created a (slightly messy) tree-sitter python script to see how many asserts we are currently missing. This commit is the result of running it over the `src/basic` dir and fixing the flagged issues. I plan to tidy it up and add it to the checks too but this is orthogonal to this commit. [1] https://github.com/systemd/systemd/pull/42360#discussion_r3426964562
65 lines
2.8 KiB
C
65 lines
2.8 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
#include "format-util.h"
|
|
|
|
char* format_bytes_full(char *buf, size_t l, uint64_t t, FormatBytesFlag flag) {
|
|
typedef struct {
|
|
const char *suffix;
|
|
uint64_t factor;
|
|
} suffix_table;
|
|
static const suffix_table table_iec[] = {
|
|
{ "E", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
|
|
{ "P", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
|
|
{ "T", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
|
|
{ "G", UINT64_C(1024)*UINT64_C(1024)*UINT64_C(1024) },
|
|
{ "M", UINT64_C(1024)*UINT64_C(1024) },
|
|
{ "K", UINT64_C(1024) },
|
|
}, table_si[] = {
|
|
{ "E", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) },
|
|
{ "P", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) },
|
|
{ "T", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) },
|
|
{ "G", UINT64_C(1000)*UINT64_C(1000)*UINT64_C(1000) },
|
|
{ "M", UINT64_C(1000)*UINT64_C(1000) },
|
|
{ "K", UINT64_C(1000) },
|
|
};
|
|
const suffix_table *table;
|
|
size_t n;
|
|
|
|
assert(buf);
|
|
assert_cc(ELEMENTSOF(table_iec) == ELEMENTSOF(table_si));
|
|
|
|
if (t == UINT64_MAX)
|
|
return NULL;
|
|
|
|
table = flag & FORMAT_BYTES_USE_IEC ? table_iec : table_si;
|
|
n = ELEMENTSOF(table_iec);
|
|
|
|
for (size_t i = 0; i < n; i++)
|
|
if (t >= table[i].factor) {
|
|
uint64_t remainder = i != n - 1 ?
|
|
(t / table[i + 1].factor * 10 / table[n - 1].factor) % 10 :
|
|
(t * 10 / table[i].factor) % 10;
|
|
|
|
if (FLAGS_SET(flag, FORMAT_BYTES_ALWAYS_POINT) ||
|
|
(FLAGS_SET(flag, FORMAT_BYTES_BELOW_POINT) && remainder > 0))
|
|
(void) snprintf(buf, l,
|
|
"%" PRIu64 ".%" PRIu64 "%s",
|
|
t / table[i].factor,
|
|
remainder,
|
|
table[i].suffix);
|
|
else
|
|
(void) snprintf(buf, l,
|
|
"%" PRIu64 "%s",
|
|
t / table[i].factor,
|
|
table[i].suffix);
|
|
|
|
goto finish;
|
|
}
|
|
|
|
(void) snprintf(buf, l, "%" PRIu64 "%s", t, flag & FORMAT_BYTES_TRAILING_B ? "B" : "");
|
|
|
|
finish:
|
|
buf[l-1] = 0;
|
|
return buf;
|
|
}
|