Skip to contentSkip to conversation

tools/bpftool: Avoid using "?:" in generated code

PATCH New Yucong Sun 1 participant 1 message Sep 28, 2021

Subsystems (2)
lore
Share & tools
lore

Yucong Sun

author
#0 lore raw

PATCH v2 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/bpf/bpftool/gen.c +4 -1
index d40d92bbf0e4..3a4afeb48bcc 100644
@@ -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\
Signature · 1 line
2.30.2