[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250911200508.79341-6-ast@fiberby.net>
Date: Thu, 11 Sep 2025 20:04:58 +0000
From: Asbjørn Sloth Tønnesen <ast@...erby.net>
To: "Jason A. Donenfeld" <Jason@...c4.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>
Cc: Asbjørn Sloth Tønnesen <ast@...erby.net>,
Donald Hunter <donald.hunter@...il.com>,
Simon Horman <horms@...nel.org>,
Jacob Keller <jacob.e.keller@...el.com>,
Sabrina Dubroca <sd@...asysnail.net>,
wireguard@...ts.zx2c4.com,
netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH net-next v3 05/13] tools: ynl-gen: add CodeWriter.p_lines() helper
Add a helper for writing an array of lines, and convert
all the existing loops doing that, to use the new helper.
This is a trivial patch with no behavioural changes intended,
there are no changes to the generated code.
Signed-off-by: Asbjørn Sloth Tønnesen <ast@...erby.net>
Reviewed-by: Donald Hunter <donald.hunter@...il.com>
---
tools/net/ynl/pyynl/ynl_gen_c.py | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py
index e4cb8c95632c..7a2e49a84735 100755
--- a/tools/net/ynl/pyynl/ynl_gen_c.py
+++ b/tools/net/ynl/pyynl/ynl_gen_c.py
@@ -180,8 +180,7 @@ class Type(SpecAttr):
def free(self, ri, var, ref):
lines = self._free_lines(ri, var, ref)
- for line in lines:
- ri.cw.p(line)
+ ri.cw.p_lines(lines)
def arg_member(self, ri):
member = self._complex_member_type(ri)
@@ -267,13 +266,9 @@ class Type(SpecAttr):
if self.presence_type() == 'present':
ri.cw.p(f"{var}->_present.{self.c_name} = 1;")
- if init_lines:
- ri.cw.nl()
- for line in init_lines:
- ri.cw.p(line)
+ ri.cw.p_lines(init_lines, nl_before=True)
- for line in lines:
- ri.cw.p(line)
+ ri.cw.p_lines(lines)
ri.cw.block_end()
return True
@@ -1788,8 +1783,7 @@ class CodeWriter:
self.block_start()
self.write_func_lvar(local_vars=local_vars)
- for line in body:
- self.p(line)
+ self.p_lines(body)
self.block_end()
def writes_defines(self, defines):
@@ -1830,6 +1824,12 @@ class CodeWriter:
self.p('#ifdef ' + config_option)
self._ifdef_block = config_option
+ def p_lines(self, lines, nl_before=False):
+ if lines and nl_before:
+ self.nl()
+ for line in lines or []:
+ self.p(line)
+
scalars = {'u8', 'u16', 'u32', 'u64', 's8', 's16', 's32', 's64', 'uint', 'sint'}
@@ -2085,8 +2085,7 @@ def put_req_nested(ri, struct):
ri.cw.block_start()
ri.cw.write_func_lvar(local_vars)
- for line in init_lines:
- ri.cw.p(line)
+ ri.cw.p_lines(init_lines)
for _, arg in struct.member_list():
arg.attr_put(ri, "obj")
@@ -2147,8 +2146,7 @@ def _multi_parse(ri, struct, init_lines, local_vars):
ri.cw.block_start()
ri.cw.write_func_lvar(local_vars)
- for line in init_lines:
- ri.cw.p(line)
+ ri.cw.p_lines(init_lines)
ri.cw.nl()
for arg in struct.inherited:
@@ -2277,10 +2275,8 @@ def parse_rsp_submsg(ri, struct):
ri.cw.block_start(line=f'{kw} (!strcmp(sel, "{name}"))')
get_lines, init_lines, _ = arg._attr_get(ri, var)
- for line in init_lines or []:
- ri.cw.p(line)
- for line in get_lines:
- ri.cw.p(line)
+ ri.cw.p_lines(init_lines)
+ ri.cw.p_lines(get_lines)
if arg.presence_type() == 'present':
ri.cw.p(f"{var}->_present.{arg.c_name} = 1;")
ri.cw.block_end()
--
2.51.0
Powered by blists - more mailing lists