<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p><br>
</p>
<br>
<div class="moz-cite-prefix">On 08/15/2018 09:11 PM, Colin King
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:20180815131129.24146-26-colin.king@canonical.com">
<pre wrap="">From: Colin Ian King <a class="moz-txt-link-rfc2396E" href="mailto:colin.king@canonical.com"><colin.king@canonical.com></a>
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 <a class="moz-txt-link-rfc2396E" href="mailto:colin.king@canonical.com"><colin.king@canonical.com></a>
---
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;
</pre>
</blockquote>
<br>
Acked-by: Ivan Hu <a class="moz-txt-link-rfc2396E"
href="mailto:ivan.hu@canonical.com"><ivan.hu@canonical.com></a>
</body>
</html>