ACK: [PATCH 25/27] uefi: uefirtvariable: rename argument attibutes to var_attributes

ivanhu ivan.hu at canonical.com
Thu Aug 16 09:20:52 UTC 2018



On 08/15/2018 09:11 PM, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> 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 <colin.king at canonical.com>
> ---
>  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;

Acked-by: Ivan Hu <ivan.hu at canonical.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/fwts-devel/attachments/20180816/967fe7d2/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/fwts-devel/attachments/20180816/967fe7d2/attachment.sig>


More information about the fwts-devel mailing list