tools: bpftool: fix format strings and arguments for jsonw_printf()

There are some mismatches between format strings and arguments passed to
jsonw_printf() in the BTF dumper for bpftool, which seems harmless but
may result in warnings if the "__printf()" attribute is used correctly
for jsonw_printf(). Let's fix relevant format strings and type cast.

Fixes: b12d6ec09730 ("bpf: btf: add btf print functionality")
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
index 8cafb9b314672fe238cb3d4e40b9dafcba1f2301..d66131f696892065240e225e2c86d44278ea4e6e 100644 (file)
--- a/tools/bpf/bpftool/btf_dumper.c
+++ b/tools/bpf/bpftool/btf_dumper.c
@@ -26,9 +26,9 @@ static void btf_dumper_ptr(const void *data, json_writer_t *jw,
                           bool is_plain_text)
 {
        if (is_plain_text)
-               jsonw_printf(jw, "%p", *(unsigned long *)data);
+               jsonw_printf(jw, "%p", data);
        else
-               jsonw_printf(jw, "%u", *(unsigned long *)data);
+               jsonw_printf(jw, "%lu", *(unsigned long *)data);
 }
 
 static int btf_dumper_modifier(const struct btf_dumper *d, __u32 type_id,
@@ -216,7 +216,7 @@ static int btf_dumper_int(const struct btf_type *t, __u8 bit_offset,
        switch (BTF_INT_ENCODING(*int_type)) {
        case 0:
                if (BTF_INT_BITS(*int_type) == 64)
-                       jsonw_printf(jw, "%lu", *(__u64 *)data);
+                       jsonw_printf(jw, "%llu", *(__u64 *)data);
                else if (BTF_INT_BITS(*int_type) == 32)
                        jsonw_printf(jw, "%u", *(__u32 *)data);
                else if (BTF_INT_BITS(*int_type) == 16)
@@ -229,7 +229,7 @@ static int btf_dumper_int(const struct btf_type *t, __u8 bit_offset,
                break;
        case BTF_INT_SIGNED:
                if (BTF_INT_BITS(*int_type) == 64)
-                       jsonw_printf(jw, "%ld", *(long long *)data);
+                       jsonw_printf(jw, "%lld", *(long long *)data);
                else if (BTF_INT_BITS(*int_type) == 32)
                        jsonw_printf(jw, "%d", *(int *)data);
                else if (BTF_INT_BITS(*int_type) == 16)