leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display_options: print_size: Fix order overflow

Browse Source 
Function print_size() round size to the nearst value with one decimal
fraction number. But in special cases also unit order may overflow.

For example value 1073689396 is printed as "1024 MiB" and value 1073741824
as "1 GiB".

Fix this issue by detecting order overflow and increasing unit order.
With this change also value 1073689396 is printed as "1 GiB".

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Pali Rohár 2022-09-12 21:02:27 +02:00 committed by Tom Rini
parent 6f915a5d24
commit d179018e4c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/display_options.c
View File

@ -127,6 +127,12 @@ void print_size(uint64_t size, const char *s)
if (m >= 10) { if (m >= 10) {
m -= 10; m -= 10;
n += 1; n += 1;
if (n == 1024 && i > 0) {
n = 1;
m = 0;
c = names[i - 1];
}
} }
} }

3
test/lib/test_print.c
View File

@ -68,6 +68,9 @@ static int lib_test_print_size(struct unit_test_state *uts)
ut_assertok(test_print_size(uts, 7654321, "7.3 MiB;")); ut_assertok(test_print_size(uts, 7654321, "7.3 MiB;"));
ut_assertok(test_print_size(uts, 87654321, "83.6 MiB;")); ut_assertok(test_print_size(uts, 87654321, "83.6 MiB;"));
ut_assertok(test_print_size(uts, 987654321, "941.9 MiB;")); ut_assertok(test_print_size(uts, 987654321, "941.9 MiB;"));
ut_assertok(test_print_size(uts, 1073689395, "1023.9 MiB;"));
ut_assertok(test_print_size(uts, 1073689396, "1 GiB;"));
ut_assertok(test_print_size(uts, 1073741824, "1 GiB;"));
ut_assertok(test_print_size(uts, 1987654321, "1.9 GiB;")); ut_assertok(test_print_size(uts, 1987654321, "1.9 GiB;"));
ut_assertok(test_print_size(uts, 54321987654321, "49.4 TiB;")); ut_assertok(test_print_size(uts, 54321987654321, "49.4 TiB;"));
return 0; return 0;