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

Alex Hung alex.hung at canonical.com
Wed Aug 15 18:12:13 UTC 2018


On 2018-08-15 06:11 AM, 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: Alex Hung <alex.hung at canonical.com>



More information about the fwts-devel mailing list