aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2020-05-15 14:48:54 -0700
committerRichard Henderson <richard.henderson@linaro.org>2020-06-08 10:36:47 -0700
commit2fd51b19c9ee73b0a1f07dcebd753a00f4fa4b26 (patch)
tree24a14f0994ab257508e1310655a1d3d2a707169b /scripts
parent49ee11555262a256afec592dfed7c5902d5eefd2 (diff)
downloadqemu-2fd51b19c9ee73b0a1f07dcebd753a00f4fa4b26.zip
qemu-2fd51b19c9ee73b0a1f07dcebd753a00f4fa4b26.tar.gz
qemu-2fd51b19c9ee73b0a1f07dcebd753a00f4fa4b26.tar.bz2
decodetree: Tidy error_with_file
Use proper varargs to print the arguments. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/decodetree.py24
1 files changed, 14 insertions, 10 deletions
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index f9d204a..b559db3 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