mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-10 18:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: Fix single-line struct definition output in btf_dump

Browse Source 
btf_dump APIs emit unnecessary tabs when emitting struct/union
definition that fits on the single line. Before this patch we'd get:

struct blah {<tab>};

This patch fixes this and makes sure that we get more natural:

struct blah {};

Fixes: 44a726c3f23c ("bpftool: Print newline before '}' for struct with padding only fields")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20221212211505.558851-2-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko
2022-12-12 13:15:00 -08:00
committed by Andrii Nakryiko
parent 8d719b0c08
commit db11704944
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/btf_dump.c
View File

@@ -959,9 +959,12 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,
* Keep `struct empty {}` on a single line, * Keep `struct empty {}` on a single line,
* only print newline when there are regular or padding fields. * only print newline when there are regular or padding fields.
*/ */
if (vlen || t->size) if (vlen || t->size) {
btf_dump_printf(d, "\n"); btf_dump_printf(d, "\n");
btf_dump_printf(d, "%s}", pfx(lvl)); btf_dump_printf(d, "%s}", pfx(lvl));
} else {
btf_dump_printf(d, "}");
}
if (packed) if (packed)
btf_dump_printf(d, " __attribute__((packed))"); btf_dump_printf(d, " __attribute__((packed))");
} }