All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [PATCH 2/8] decodetree: Tidy error_with_file
Date: Mon, 18 May 2020 09:40:46 -0700	[thread overview]
Message-ID: <20200518164052.18689-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200518164052.18689-1-richard.henderson@linaro.org>

Use proper varargs to print the arguments.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 scripts/decodetree.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index f9d204aa36..b559db3086 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -51,23 +51,27 @@ def error_with_file(file, lineno, *args):
     global output_file
     global output_fd
 
+    prefix = ''
+    if file:
+        prefix += '{0}:'.format(file)
     if lineno:
-        r = '{0}:{1}: error:'.format(file, lineno)
-    elif input_file:
-        r = '{0}: error:'.format(file)
-    else:
-        r = 'error:'
-    for a in args:
-        r += ' ' + str(a)
-    r += '\n'
-    sys.stderr.write(r)
+        prefix += '{0}:'.format(lineno)
+    if prefix:
+        prefix += ' '
+    print(prefix, end='error: ', file=sys.stderr)
+    print(*args, file=sys.stderr)
+
     if output_file and output_fd:
         output_fd.close()
         os.remove(output_file)
     exit(1)
+# end error_with_file
+
 
 def error(lineno, *args):
-    error_with_file(input_file, lineno, args)
+    error_with_file(input_file, lineno, *args)
+# end error
+
 
 def output(*args):
     global output_fd
-- 
2.20.1



  parent reply	other threads:[~2020-05-18 16:47 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-18 16:40 [PATCH 0/8] decodetree: Add non-overlapping groups Richard Henderson
2020-05-18 16:40 ` [PATCH 1/8] decodetree: Remove python 3.4 check Richard Henderson
2020-05-18 16:46   ` Philippe Mathieu-Daudé
2020-05-29  9:35   ` Philippe Mathieu-Daudé
2020-05-18 16:40 ` Richard Henderson [this message]
2020-06-02 14:24   ` [PATCH 2/8] decodetree: Tidy error_with_file Peter Maydell
2020-05-18 16:40 ` [PATCH 3/8] decodetree: Rename MultiPattern to IncMultiPattern Richard Henderson
2020-05-18 16:47   ` Philippe Mathieu-Daudé
2020-05-18 16:40 ` [PATCH 4/8] decodetree: Split out MultiPattern from IncMultiPattern Richard Henderson
2020-05-18 16:47   ` Philippe Mathieu-Daudé
2020-05-18 16:40 ` [PATCH 5/8] decodetree: Allow group covering the entire insn space Richard Henderson
2020-06-02 14:35   ` Peter Maydell
2020-06-02 15:15     ` Richard Henderson
2020-06-02 19:11   ` Peter Maydell
2020-05-18 16:40 ` [PATCH 6/8] decodetree: Move semantic propagation into classes Richard Henderson
2020-06-02 19:12   ` Peter Maydell
2020-05-18 16:40 ` [PATCH 7/8] decodetree: Implement non-overlapping groups Richard Henderson
2020-05-18 16:53   ` Philippe Mathieu-Daudé
2020-06-02 19:13   ` Peter Maydell
2020-06-02 19:19     ` Richard Henderson
2020-05-18 16:40 ` [PATCH 8/8] target/arm: Use a non-overlapping group for misc control Richard Henderson
2020-05-18 16:56   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200518164052.18689-3-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.