2018-05-24 03:26:33

by Xiaoming Ni

Subject: [PATCH] scripts/dtc: Fixed format mismatch in fprintf

format specifier "d" need arg type "int" , but the according arg
"fdt32_to_cpu(xxx)" has type "unsigned int"

Signed-off-by: nixiaoming <[email protected]>
---
scripts/dtc/fdtdump.c | 6 +++---
scripts/dtc/flattree.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/dtc/fdtdump.c b/scripts/dtc/fdtdump.c
index 7d460a5..851bb6f 100644
--- a/scripts/dtc/fdtdump.c
+++ b/scripts/dtc/fdtdump.c
@@ -66,12 +66,12 @@ static void dump_blob(void *blob)

printf("/dts-v1/;\n");
printf("// magic:\t\t0x%x\n", fdt32_to_cpu(bph->magic));
- printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
+ printf("// totalsize:\t\t0x%x (%u)\n", totalsize, totalsize);
printf("// off_dt_struct:\t0x%x\n", off_dt);
printf("// off_dt_strings:\t0x%x\n", off_str);
printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
- printf("// version:\t\t%d\n", version);
- printf("// last_comp_version:\t%d\n",
+ printf("// version:\t\t%u\n", version);
+ printf("// last_comp_version:\t%u\n",
fdt32_to_cpu(bph->last_comp_version));
if (version >= 2)
printf("// boot_cpuid_phys:\t0x%x\n",
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index 8d268fb..28da281 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -393,7 +393,7 @@ void dt_to_blob(FILE *f, struct dt_info *dti, int version)
padlen = 0;
if (quiet < 1)
fprintf(stderr,
- "Warning: blob size %d >= minimum size %d\n",
+ "Warning: blob size %u >= minimum size %d\n",
fdt32_to_cpu(fdt.totalsize), minsize);
}
}
--
2.10.1

2018-05-25 02:27:24

by Frank Rowand

Subject: Re: [PATCH] scripts/dtc: Fixed format mismatch in fprintf

On 05/23/18 19:50, nixiaoming wrote:
> format specifier "d" need arg type "int" , but the according arg
> "fdt32_to_cpu(xxx)" has type "unsigned int"
>
> Signed-off-by: nixiaoming <[email protected]>
> ---
> scripts/dtc/fdtdump.c | 6 +++---
> scripts/dtc/flattree.c | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/dtc/fdtdump.c b/scripts/dtc/fdtdump.c
> index 7d460a5..851bb6f 100644
> --- a/scripts/dtc/fdtdump.c
> +++ b/scripts/dtc/fdtdump.c
> @@ -66,12 +66,12 @@ static void dump_blob(void *blob)
>
> printf("/dts-v1/;\n");
> printf("// magic:\t\t0x%x\n", fdt32_to_cpu(bph->magic));
> - printf("// totalsize:\t\t0x%x (%d)\n", totalsize, totalsize);
> + printf("// totalsize:\t\t0x%x (%u)\n", totalsize, totalsize);
> printf("// off_dt_struct:\t0x%x\n", off_dt);
> printf("// off_dt_strings:\t0x%x\n", off_str);
> printf("// off_mem_rsvmap:\t0x%x\n", off_mem_rsvmap);
> - printf("// version:\t\t%d\n", version);
> - printf("// last_comp_version:\t%d\n",
> + printf("// version:\t\t%u\n", version);
> + printf("// last_comp_version:\t%u\n",
> fdt32_to_cpu(bph->last_comp_version));
> if (version >= 2)
> printf("// boot_cpuid_phys:\t0x%x\n",
> diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
> index 8d268fb..28da281 100644
> --- a/scripts/dtc/flattree.c
> +++ b/scripts/dtc/flattree.c
> @@ -393,7 +393,7 @@ void dt_to_blob(FILE *f, struct dt_info *dti, int version)
> padlen = 0;
> if (quiet < 1)
> fprintf(stderr,
> - "Warning: blob size %d >= minimum size %d\n",
> + "Warning: blob size %u >= minimum size %d\n",
> fdt32_to_cpu(fdt.totalsize), minsize);
> }
> }
>


We import this file from the upstream dtc project. Please send patches
for this file to:

David Gibson <[email protected]>
[email protected]

Thanks,

Frank