On 2015/12/17 23:05, Ard Biesheuvel wrote:
On 17 December 2015 at 15:23, Zeng, Star <[email protected]> wrote:
On 2015/12/17 18:00, Ard Biesheuvel wrote:

Clang does not allow straight assignment of va_list types, so use the
correct VA_COPY() instead.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
---
   MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)


First, the patch is good to me.
Reviewed-by: Star Zeng <[email protected]>

But Andrew ever has sent same code change and passed code review before.
http://article.gmane.org/gmane.comp.bios.edk2.devel/4160/
http://article.gmane.org/gmane.comp.bios.edk2.devel/3989/

As I know, Andrew has the permission to commit code, but he did not commit
that code yet.

You and Andrew need my help to commit the code with just Andrew's
Signed-off-by or with your both's Signed-off-by?


I don't care at all which version gets committed. Please go ahead and
commit the version you prefer.

I select Andrew's version as it came out first, and committed the code at RR19419. Hope you do not mind.

Thanks,
Star


Thanks,
Ard.



diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 621ce16da006..0c18d195215a 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1716,7 +1716,7 @@ CheckRemainingSpaceForConsistencyInternal (
     ASSERT_EFI_ERROR (Status);

     TotalNeededSize = 0;
-  Args = Marker;
+  VA_COPY(Args, Marker);
     VariableEntry = VA_ARG (Args, VARIABLE_ENTRY_CONSISTENCY *);
     while (VariableEntry != NULL) {
       //
@@ -1745,7 +1745,7 @@ CheckRemainingSpaceForConsistencyInternal (
       return FALSE;
     }

-  Args = Marker;
+  VA_COPY(Args, Marker);
     VariableEntry = VA_ARG (Args, VARIABLE_ENTRY_CONSISTENCY *);
     while (VariableEntry != NULL) {
       //


_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to