tools/bpftool: Avoid using "?:" in generated code
PATCH 1/1 tools/bpftool: Avoid using "?:" in generated code
"?:" is a GNU C extension, some environment has warning flags for its use, or even prohibit it directly. This patch avoid triggering these problems by simply expand it to its full form, no functionality change.
--- tools/bpf/bpftool/gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/gen.c +1 -1
@@ -803,7 +803,7 @@ static int do_skeleton(int argc, char **argv) } \n\ \n\ err = %1$s__create_skeleton(obj); \n\ - err = err ?: bpf_object__open_skeleton(obj->skeleton, opts);\n\ + err = err ? err : bpf_object__open_skeleton(obj->skeleton, opts);\n\ if (err) \n\ goto err_out; \n\ \n\
Signature · 1 line
2.30.2
Quoted 7 lines · Yucong Sun
"?:" is a GNU C extension, some environment has warning flags for its use, or even prohibit it directly. This patch avoid triggering these problems by simply expand it to its full form, no functionality change.
Signed-off-by Yucong Sun <[email protected]>---
Given there is no bug in the first place, it's not a fix, and thus should target bpf-next tree.
tools/bpf/bpftool/gen.c static int do_skeleton(int argc, char **argv) · line 806
Quoted 13 lines
tools/bpf/bpftool/gen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/bpf/bpftool/gen.c +1
-1@@ -803,7 +803,7 @@ static int do_skeleton(int argc, char **argv) } \n\ \n\ err = %1$s__create_skeleton(obj); \n\ - err = err ?: bpf_object__open_skeleton(obj->skeleton, opts);\n\ + err = err ? err : bpf_object__open_skeleton(obj->skeleton, opts);\n\
err+err+err in one row looks quite bad. If we can't use ?: for shortness, maybe let's just do
if (!err)
err = <some operation>
It's more verbose than the original version, but it's more obvious and sort of canonical C?
Quoted 6 lines
tools/bpf/bpftool/gen.c +0
-1if (err) \n\ goto err_out; \n\ \n\ --2.30.2