[PATCH v1 3/4] test: fdt: fix run_commandf() warnings

[Evgeny Bachinin]

Fix warnings both for 32bit and 64bit architecture after adding
printf-like attribute format for run_commandf():
warning: format ‘%x’ expects argument of type ‘unsigned int’, but
  argument 2 has type ‘ulong {aka long unsigned int}’ [-Wformat=]
  ret = run_commandf("fdt addr -c %08x", addr);
 ^
Signed-off-by: Evgeny Bachinin 
---
 test/cmd/fdt.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c
index 7974c88c0d..be99bef134 100644
--- a/test/cmd/fdt.c
+++ b/test/cmd/fdt.c
@@ -72,7 +72,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
/* Set the working FDT */
set_working_fdt_addr(0);
ut_assert_nextline("Working FDT set to 0");
-   ut_assertok(run_commandf("fdt addr %08x", addr));
+   ut_assertok(run_commandf("fdt addr %08lx", addr));
ut_assert_nextline("Working FDT set to %lx", addr);
ut_asserteq(addr, map_to_sysmem(working_fdt));
ut_assertok(ut_check_console_end(uts));
@@ -82,7 +82,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
/* Set the control FDT */
fdt_blob = gd->fdt_blob;
gd->fdt_blob = NULL;
-   ret = run_commandf("fdt addr -c %08x", addr);
+   ret = run_commandf("fdt addr -c %08lx", addr);
new_fdt = gd->fdt_blob;
gd->fdt_blob = fdt_blob;
ut_assertok(ret);
@@ -91,7 +91,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
 
/* Test setting an invalid FDT */
fdt[0] = 123;
-   ut_asserteq(1, run_commandf("fdt addr %08x", addr));
+   ut_asserteq(1, run_commandf("fdt addr %08lx", addr));
ut_assert_nextline("libfdt fdt_check_header(): FDT_ERR_BADMAGIC");
ut_assertok(ut_check_console_end(uts));
 
@@ -120,19 +120,19 @@ static int fdt_test_resize(struct unit_test_state *uts)
 
/* Test setting and resizing the working FDT to a larger size */
ut_assertok(console_record_reset_enable());
-   ut_assertok(run_commandf("fdt addr %08x %x", addr, newsize));
+   ut_assertok(run_commandf("fdt addr %08lx %x", addr, newsize));
ut_assert_nextline("Working FDT set to %lx", addr);
ut_assertok(ut_check_console_end(uts));
 
/* Try shrinking it */
-   ut_assertok(run_commandf("fdt addr %08x %x", addr, sizeof(fdt) / 4));
+   ut_assertok(run_commandf("fdt addr %08lx %zx", addr, sizeof(fdt) / 4));
ut_assert_nextline("Working FDT set to %lx", addr);
ut_assert_nextline("New length %d < existing length %d, ignoring",
   (int)sizeof(fdt) / 4, newsize);
ut_assertok(ut_check_console_end(uts));
 
/* ...quietly */
-   ut_assertok(run_commandf("fdt addr -q %08x %x", addr, sizeof(fdt) / 4));
+   ut_assertok(run_commandf("fdt addr -q %08lx %zx", addr, sizeof(fdt) / 
4));
ut_assert_nextline("Working FDT set to %lx", addr);
ut_assertok(ut_check_console_end(uts));
 
-- 
2.17.1

Re: [PATCH v1 3/4] test: fdt: fix run_commandf() warnings

[Simon Glass]

On Fri, 10 Mar 2023 at 10:55, Evgeny Bachinin  wrote:
>
> Fix warnings both for 32bit and 64bit architecture after adding
> printf-like attribute format for run_commandf():
> warning: format ‘%x’ expects argument of type ‘unsigned int’, but
>   argument 2 has type ‘ulong {aka long unsigned int}’ [-Wformat=]
>   ret = run_commandf("fdt addr -c %08x", addr);
>  ^
> Signed-off-by: Evgeny Bachinin 
> ---
>  test/cmd/fdt.c | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>

Reviewed-by: Simon Glass