From: Yucong Sun Date: Tue, 28 Sep 2021 18:42:21 +0000 (-0700) Subject: bpftool: Avoid using "?: " in generated code X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=09710d82c0a3469eadc32781721ac2336fdf915d;p=uclinux-h8%2Flinux.git 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. Signed-off-by: Yucong Sun Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20210928184221.1545079-1-fallentree@fb.com --- diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index e3ec47a6a612..cc835859465b 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -803,7 +803,10 @@ 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\ + if (err) \n\ + goto err_out; \n\ + \n\ + err = bpf_object__open_skeleton(obj->skeleton, opts);\n\ if (err) \n\ goto err_out; \n\ \n\