mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-03 12:05:13 +02:00
32222c0fd2
[ Upstream commitcf67629f7f] No need to specify the array size, let the compiler figure that out. This addresses this compiler warning that was noticed while build testing on fedora rawhide: 31 15.81 fedora:rawhide : FAIL gcc version 15.0.1 20250225 (Red Hat 15.0.1-0) (GCC) util/units.c: In function 'unit_number__scnprintf': util/units.c:67:24: error: initializer-string for array of 'char' is too long [-Werror=unterminated-string-initialization] 67 | char unit[4] = "BKMG"; | ^~~~~~ cc1: all warnings being treated as errors Fixes:9808143ba2("perf tools: Add unit_number__scnprintf function") Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Link: https://lore.kernel.org/r/20250310194534.265487-3-acme@kernel.org Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
77 lines
1.2 KiB
C
77 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "units.h"
|
|
#include <inttypes.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/time64.h>
|
|
|
|
unsigned long parse_tag_value(const char *str, struct parse_tag *tags)
|
|
{
|
|
struct parse_tag *i = tags;
|
|
|
|
while (i->tag) {
|
|
char *s = strchr(str, i->tag);
|
|
|
|
if (s) {
|
|
unsigned long int value;
|
|
char *endptr;
|
|
|
|
value = strtoul(str, &endptr, 10);
|
|
if (s != endptr)
|
|
break;
|
|
|
|
if (value > ULONG_MAX / i->mult)
|
|
break;
|
|
value *= i->mult;
|
|
return value;
|
|
}
|
|
i++;
|
|
}
|
|
|
|
return (unsigned long) -1;
|
|
}
|
|
|
|
double convert_unit_double(double value, char *unit)
|
|
{
|
|
*unit = ' ';
|
|
|
|
if (value > 1000.0) {
|
|
value /= 1000.0;
|
|
*unit = 'K';
|
|
}
|
|
|
|
if (value > 1000.0) {
|
|
value /= 1000.0;
|
|
*unit = 'M';
|
|
}
|
|
|
|
if (value > 1000.0) {
|
|
value /= 1000.0;
|
|
*unit = 'G';
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
unsigned long convert_unit(unsigned long value, char *unit)
|
|
{
|
|
double v = convert_unit_double((double)value, unit);
|
|
|
|
return (unsigned long)v;
|
|
}
|
|
|
|
int unit_number__scnprintf(char *buf, size_t size, u64 n)
|
|
{
|
|
char unit[] = "BKMG";
|
|
int i = 0;
|
|
|
|
while (((n / 1024) > 1) && (i < 3)) {
|
|
n /= 1024;
|
|
i++;
|
|
}
|
|
|
|
return scnprintf(buf, size, "%" PRIu64 "%c", n, unit[i]);
|
|
}
|