From patchwork Wed Aug 15 13:11:27 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: 957894 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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41r8xq4jM7z9sCW; Wed, 15 Aug 2018 23:11:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fpvae-00045a-39; Wed, 15 Aug 2018 13:11:56 +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 1fpvaR-0003uV-Uh for fwts-devel@lists.ubuntu.com; Wed, 15 Aug 2018 13:11:43 +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 1fpvaQ-00087o-Qy; Wed, 15 Aug 2018 13:11:42 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 25/27] uefi: uefirtvariable: rename argument attibutes to var_attributes Date: Wed, 15 Aug 2018 14:11:27 +0100 Message-Id: <20180815131129.24146-26-colin.king@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180815131129.24146-1-colin.king@canonical.com> References: <20180815131129.24146-1-colin.king@canonical.com> 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 Argument attibutes shadows the global variable name attibutes so rename it to var_attributes to avoid any variable shadowing confusion Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/uefi/uefirtvariable/uefirtvariable.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c index 552790e0..c3230868 100644 --- a/src/uefi/uefirtvariable/uefirtvariable.c +++ b/src/uefi/uefirtvariable/uefirtvariable.c @@ -873,7 +873,7 @@ err: static int setvariable_insertvariable( fwts_framework *fw, - const uint32_t attributes, + const uint32_t var_attributes, const uint64_t datasize, uint16_t *varname, EFI_GUID *gtestguid, @@ -892,7 +892,7 @@ static int setvariable_insertvariable( setvariable.VariableName = varname; setvariable.VendorGuid = gtestguid; - setvariable.Attributes = attributes; + setvariable.Attributes = var_attributes; setvariable.DataSize = datasize; setvariable.Data = data; setvariable.status = &status; @@ -1035,7 +1035,7 @@ static int setvariable_checkvariable_notfound( static int setvariable_invalidattr( fwts_framework *fw, - const uint32_t attributes, + const uint32_t var_attributes, const uint64_t datasize, uint16_t *varname, EFI_GUID *gtestguid, @@ -1052,7 +1052,7 @@ static int setvariable_invalidattr( setvariable.VariableName = varname; setvariable.VendorGuid = gtestguid; - setvariable.Attributes = attributes; + setvariable.Attributes = var_attributes; setvariable.DataSize = datasize; setvariable.Data = data; setvariable.status = &status;