From nobody Fri Dec 19 20:13:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1591142378; cv=none; d=zohomail.com; s=zohoarc; b=NYtcASqWUUJkSye7HP04AEVMl6+fh/2XAdsIxVVer1sl1/K3ZUzzCbnbqd/bIfr1q6awP5Oo9WmmItnVmRv5SdM5cKkox7Y2qED62mIFlt4EYJWl3Tqzet01l7ztpr1Cs9mRglKpo2BAUp2WUk10QcaC7ZxIIkx6tX4cJWII2iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591142378; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b/XVcjpntbxdGusUz05j9FBinJNgwBz4HL/Wlk1yj2E=; b=IRVbzWXdPCAZkz0hmJf20HZgD7uEE18wRuwhkhavdIKW+9hiWEAcXaKenonvaNYeCYyxbgKs7xvoO6uGkW7z3jHaJVFdkyusXqW5WtpYnYGJGaXJhjwiankpt75U0razbzFjRkQ9Q3qMpp1RcoGzLiUQU0In4nWx5QfJ4RPAH38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591142378384326.55421767091445; Tue, 2 Jun 2020 16:59:38 -0700 (PDT) Received: from localhost ([::1]:44124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgGoj-00065g-4G for importer@patchew.org; Tue, 02 Jun 2020 19:59:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgGno-0004gq-2f for qemu-devel@nongnu.org; Tue, 02 Jun 2020 19:58:40 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:34617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgGnn-00023w-BG for qemu-devel@nongnu.org; Tue, 02 Jun 2020 19:58:39 -0400 Received: by mail-pf1-x42a.google.com with SMTP id z64so311547pfb.1 for ; Tue, 02 Jun 2020 16:58:38 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id k101sm182201pjb.26.2020.06.02.16.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 16:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b/XVcjpntbxdGusUz05j9FBinJNgwBz4HL/Wlk1yj2E=; b=oc0q7LE8Ir+zgj8P7CjTLNYzDwOGofSquj4cPNWu4X2f55BBwaNOf4x6zIrp2h9W5b JseoxQooDeat3yLtserJmk+8bN3F5E9iRSxtnh9yi1DHGqt7abmk2aWu0wguPxuOUDd4 581QuzwySphwwiinxi62TH/IluBcbojUy4vBS640o+SJvDdJPnNSnUdMFI/BbUBL0cdb vzOsZ4xJ5G+CmtxahUk8h9oTk9GHpTxov95t6ONGAQY0xHt1OUCph30uxMrBSPViTZ1A 5pvl2+TNMeLernxhxksMwzid19YsCx6s1CWzICZSJrtAoFAONyW3acV4y3GRrxxKD7IM 3hhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b/XVcjpntbxdGusUz05j9FBinJNgwBz4HL/Wlk1yj2E=; b=UC17DxwqfHL8tEOZGg7T/t3sZZhLoZ5FkYSH9COD/Fpq4i8KPkP5KfUYWtptKNw7eT SUeQNo8I3AneRXdI1tH7k9xdCgfSDj+B6eavE9SDrPTWqKJRTN78sOfZlGHJRSu8qKP5 S29zSU/fXUqMRNhYDGbp8yFAJqtG/gsiM4PQsZ6XMykSgmN1dNgm06wIrLMfoaryX3OY o+m991+l8L2lZ8JtqsET80EA7/Vo8AeiGsaJSaFKeIGJVsWf/KlB94G++cHWrwPEDBmI J3oX8yXS+b7jincIrLUHc9k/AiNo8PcZzMTuDeRx3fo/z25yf7QFNevKgIdXtCqekWXc i95A== X-Gm-Message-State: AOAM533fO5OWXOnAqFhFsnFz3TFoXCgJ43iOzICQeBnGPr7KjAsPLBGL ipqpUoBER60ebxp9ZYneO+LofZOHxs0= X-Google-Smtp-Source: ABdhPJy6v3rHbv7l607aiZmTl5JiDkZV2JdtSX/Ym2LNkRDkmgqJakBTfwRugpyuBCaiZL0WPZh2xQ== X-Received: by 2002:a17:90b:4c44:: with SMTP id np4mr1821245pjb.63.1591142317535; Tue, 02 Jun 2020 16:58:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 1/8] decodetree: Tidy error_with_file Date: Tue, 2 Jun 2020 16:58:27 -0700 Message-Id: <20200602235834.470345-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200602235834.470345-1-richard.henderson@linaro.org> References: <20200602235834.470345-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Use proper varargs to print the arguments. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- 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 =20 + prefix =3D '' + if file: + prefix +=3D '{0}:'.format(file) if lineno: - r =3D '{0}:{1}: error:'.format(file, lineno) - elif input_file: - r =3D '{0}: error:'.format(file) - else: - r =3D 'error:' - for a in args: - r +=3D ' ' + str(a) - r +=3D '\n' - sys.stderr.write(r) + prefix +=3D '{0}:'.format(lineno) + if prefix: + prefix +=3D ' ' + print(prefix, end=3D'error: ', file=3Dsys.stderr) + print(*args, file=3Dsys.stderr) + if output_file and output_fd: output_fd.close() os.remove(output_file) exit(1) +# end error_with_file + =20 def error(lineno, *args): - error_with_file(input_file, lineno, args) + error_with_file(input_file, lineno, *args) +# end error + =20 def output(*args): global output_fd --=20 2.25.1