From patchwork Tue Nov 13 12:52:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 997085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42vSFy0J67z9rxp; Tue, 13 Nov 2018 23:52:37 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gMYBH-0003HE-4l; Tue, 13 Nov 2018 12:52:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gMYBF-0003H7-RV for fwts-devel@lists.ubuntu.com; Tue, 13 Nov 2018 12:52:33 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gMYBF-0006Q9-IV; Tue, 13 Nov 2018 12:52:33 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: syntaxcheck: rename syntaxcheck_table to syntaxcheck_single_table Date: Tue, 13 Nov 2018 12:52:33 +0000 Message-Id: <20181113125233.17653-1-colin.king@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King Function name syntaxcheck_table is also being used as a local variable in function syntaxcheck_load_advice, and hence we've got some global and local name shadowing occurring. Rename function syntaxcheck_table to avoid this shadowing. Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/syntaxcheck/syntaxcheck.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/acpi/syntaxcheck/syntaxcheck.c b/src/acpi/syntaxcheck/syntaxcheck.c index 1556b48a..b0a5268c 100644 --- a/src/acpi/syntaxcheck/syntaxcheck.c +++ b/src/acpi/syntaxcheck/syntaxcheck.c @@ -460,11 +460,11 @@ static void syntaxcheck_give_advice(fwts_framework *fw, uint32_t error_code) } /* - * syntaxcheck_table() + * syntaxcheck_single_table() * disassemble and reassemble a table, check for errors. which indicates the Nth * table */ -static int syntaxcheck_table( +static int syntaxcheck_single_table( fwts_framework *fw, const fwts_acpi_table_info *info, const int n) @@ -627,7 +627,7 @@ static int syntaxcheck_tables(fwts_framework *fw) if (fwts_acpi_get_table(fw, i, &info) != FWTS_OK) break; if (info && info->has_aml) - syntaxcheck_table(fw, info, n++); + syntaxcheck_single_table(fw, info, n++); } return FWTS_OK;