c23ify
This commit is contained in:
14
src/utils.c
14
src/utils.c
@@ -55,7 +55,7 @@ inline char *pretty_num(const double num, char *buf, const size_t bufsz) {
|
||||
}
|
||||
|
||||
inline char *pretty_bytes(const uint64_t bytes, int8_t start_suffix, char *buf, const size_t bufsz) {
|
||||
const char suffix_list[] = {'K', 'M', 'G', 'T', 'P', 'E', 'Z'};
|
||||
constexpr char suffix_list[] = {'K', 'M', 'G', 'T', 'P', 'E', 'Z'};
|
||||
start_suffix *= -1;
|
||||
double bytes_d = (double)bytes;
|
||||
while (bytes_d >= 1024.0) {
|
||||
@@ -71,7 +71,7 @@ int get_hwmon_dir(char *path, const size_t bufsz) {
|
||||
glob_t g;
|
||||
strcat(path, "/hwmon*");
|
||||
|
||||
if (glob(path, 0, NULL, &g) == 0) {
|
||||
if (glob(path, 0, nullptr, &g) == 0) {
|
||||
strlcpy(path, g.gl_pathv[0], bufsz); // same size as hwmon length, careful
|
||||
globfree(&g);
|
||||
return 0;
|
||||
@@ -103,25 +103,25 @@ inline size_t read_file(const char *dir, const char *file, char *buffer, const s
|
||||
|
||||
inline void fast_read_num_u64(const char *dir, const char *file, char *buf, uint64_t *result, const uint32_t divider) {
|
||||
read_file(dir, file, buf, 32);
|
||||
*result = strtoull(buf, NULL, 10) / divider;
|
||||
*result = strtoull(buf, nullptr, 10) / divider;
|
||||
}
|
||||
|
||||
inline void fast_read_num_u16(const char *dir, const char *file, char *buf, uint16_t *result, const uint32_t divider) {
|
||||
read_file(dir, file, buf, 32);
|
||||
*result = strtol(buf, NULL, 10) / divider;
|
||||
*result = strtol(buf, nullptr, 10) / divider;
|
||||
}
|
||||
|
||||
inline void fast_read_num_u8(const char *dir, const char *file, char *buf, uint8_t *result, const uint32_t divider) {
|
||||
read_file(dir, file, buf, 32);
|
||||
*result = strtol(buf, NULL, 10) / divider;
|
||||
*result = strtol(buf, nullptr, 10) / divider;
|
||||
}
|
||||
|
||||
inline void fast_read_num_i16(const char *dir, const char *file, char *buf, int16_t *result, const uint32_t divider) {
|
||||
read_file(dir, file, buf, 32);
|
||||
*result = (int16_t)(strtol(buf, NULL, 10) / divider);
|
||||
*result = (int16_t)(strtol(buf, nullptr, 10) / divider);
|
||||
}
|
||||
|
||||
inline void fast_read_num_f(const char *dir, const char *file, char *buf, float *result, const uint32_t divider) {
|
||||
read_file(dir, file, buf, 32);
|
||||
*result = (float)strtoull(buf, NULL, 10) / (float)divider;
|
||||
*result = (float)strtoull(buf, nullptr, 10) / (float)divider;
|
||||
}
|
||||
Reference in New Issue
Block a user