From a99bfdf647953f8ac4ae71f373113e8ac194f1c0 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Mon, 5 Jun 2023 12:01:05 -0700 Subject: [PATCH] tools: ynl-gen: clean up stray new lines at the end of reply-less requests Do not print empty lines before closing brackets. Reviewed-by: Willem de Bruijn Signed-off-by: Jakub Kicinski --- tools/net/ynl/ynl-gen-c.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index 4c12c6f8968e0..1e64c5c2a0877 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -944,9 +944,10 @@ class CodeWriter: def _is_cond(cls, line): return line.startswith('if') or line.startswith('while') or line.startswith('for') - def p(self, line, add_ind=0): + def p(self, line, add_ind=0, eat_nl=False): if self._nl: - self._out.write('\n') + if not eat_nl: + self._out.write('\n') self._nl = False ind = self._ind if line[-1] == ':': @@ -971,7 +972,7 @@ class CodeWriter: if line and line[0] not in {';', ','}: line = ' ' + line self._ind -= 1 - self.p('}' + line) + self.p('}' + line, eat_nl=True) def write_doc_line(self, doc, indent=True): words = doc.split() -- 2.49.0