Add Missing invocations to VA_END() for VA_START().

Signed-off-by: rsun3
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12979 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 53 insertions, 21 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Handle.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Handle.c
index 9cf391d40..b6484731e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Handle.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Handle.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -71,6 +71,7 @@ Returns:
   AnInterface = NULL;

   VA_START (args, Interface);

   ProtocolFirst = VA_ARG (args, EFI_GUID *);

+  VA_END (args);

 

   //

   // Get list of all handles that support the first protocol.

@@ -146,6 +147,8 @@ Returns:
                           );

         }

 

+        VA_END (args);

+        

         goto lbl_out;

       }

 

@@ -163,6 +166,7 @@ Returns:
       }

     }

 

+    VA_END (args);

   }

 

   //

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
index 2c8dc73ae..83939670f 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -416,8 +416,7 @@ Returns:
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *Sto;

   EFI_STATUS                    Status;

   VA_LIST                       Args;

-

-  VA_START (Args, Fmt);

+  UINTN                         LengthOfPrinted;

 

   Handle = gST->ConsoleOutHandle;

 

@@ -454,7 +453,10 @@ Returns:
     return 0;

   }

 

-  return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);

+  VA_START (Args, Fmt);

+  LengthOfPrinted = _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);

+  VA_END (Args);

+  return LengthOfPrinted;

 }

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
index 0988cc2f3..1492e53d6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -390,8 +390,7 @@ Returns:
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *Sto;

   EFI_STATUS                    Status;

   VA_LIST                       Args;

-

-  VA_START (Args, Fmt);

+  UINTN                         LengthOfPrinted;

 

   Handle = gST->ConsoleOutHandle;

 

@@ -428,7 +427,10 @@ Returns:
     return 0;

   }

 

-  return _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);

+  VA_START (Args, Fmt);

+  LengthOfPrinted = _IPrint (GraphicsOutput, UgaDraw, Sto, X, Y, ForeGround, BackGround, Fmt, Args);

+  VA_END (Args);

+  return LengthOfPrinted;

 }

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index b0c9a7f1f..1452ef003 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -508,6 +508,7 @@ Returns:
     StackString = VA_ARG (Marker, CHAR16 *);

 

     if (StackString == NULL) {

+      VA_END (Marker);

       return EFI_INVALID_PARAMETER;

     }

 

@@ -517,6 +518,7 @@ Returns:
       LargestString = StringLen;

     }

   }

+  VA_END (Marker);

 

   if ((LargestString + 2) > DimensionsWidth) {

     LargestString = DimensionsWidth - 2;

@@ -682,6 +684,7 @@ ExtractDefault(
       BufferPos += Width;

 

       if ((UINTN)(Offset + Width) > *BufferSize) {

+        VA_END (Args);

         return EFI_BUFFER_TOO_SMALL;

       }

 

@@ -1025,6 +1028,7 @@ ConstructConfigAltResp (
     BufToHexString (StringPtr + 8, &StrBufferLen, (UINT8 *) &AltCfgId, sizeof (UINT16));

     Status = ExtractBlockConfig (DefaultValueArray, &AltCfg[Index]);

     if (EFI_ERROR (Status)) {

+      VA_END (Args);

       return Status;

     }

     AltRespLen += EfiStrLen (AltCfg[Index]);

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SwitchStack.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SwitchStack.c
index 92b7cba0c..d9b754890 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SwitchStack.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/SwitchStack.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -65,6 +65,7 @@ SwitchStack (
 

   InternalSwitchStack (EntryPoint, Context1, Context2, NewStack, Marker);

 

+  VA_END (Marker);

   //

   // InternalSwitchStack () will never return

   //

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
index ecb55ebb2..3258b016b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BasePrintLib/PrintLib.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -601,9 +601,12 @@ BasePrintLibSPrint (
   )

 {

   VA_LIST  Marker;

+  UINTN    NumberOfPrinted;

 

   VA_START (Marker, FormatString);

-  return BasePrintLibVSPrint (StartOfBuffer, BufferSize, Flags, FormatString, Marker);

+  NumberOfPrinted = BasePrintLibVSPrint (StartOfBuffer, BufferSize, Flags, FormatString, Marker);

+  VA_END (Marker);

+  return NumberOfPrinted;

 }

 

 /**

@@ -696,9 +699,12 @@ UnicodeSPrint (
   )

 {

   VA_LIST Marker;

+  UINTN   NumberOfPrinted;

 

   VA_START (Marker, FormatString);

-  return UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

+  NumberOfPrinted = UnicodeVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

+  VA_END (Marker);

+  return NumberOfPrinted;

 }

 

 /**

@@ -789,9 +795,12 @@ UnicodeSPrintAsciiFormat (
   )

 {

   VA_LIST Marker;

+  UINTN   NumberOfPrinted;

 

   VA_START (Marker, FormatString);

-  return UnicodeVSPrintAsciiFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+  NumberOfPrinted = UnicodeVSPrintAsciiFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+  VA_END (Marker);

+  return NumberOfPrinted;

 }

 

 /**

@@ -933,9 +942,12 @@ AsciiSPrint (
   )

 {

   VA_LIST Marker;

+  UINTN   NumberOfPrinted;

 

   VA_START (Marker, FormatString);

-  return AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

+  NumberOfPrinted = AsciiVSPrint (StartOfBuffer, BufferSize, FormatString, Marker);

+  VA_END (Marker);

+  return NumberOfPrinted;

 }

 

 /**

@@ -1026,9 +1038,12 @@ AsciiSPrintUnicodeFormat (
   )

 {

   VA_LIST Marker;

+  UINTN   NumberOfPrinted;

 

   VA_START (Marker, FormatString);

-  return AsciiVSPrintUnicodeFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+  NumberOfPrinted = AsciiVSPrintUnicodeFormat (StartOfBuffer, BufferSize, FormatString, Marker);

+  VA_END (Marker);

+  return NumberOfPrinted;

 }

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 288c431cd..c347bf294 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -143,6 +143,8 @@ Returns:
     Status      = RegisterEsalFunction (FunctionId, ClassGuid, Function, ModuleGlobal);

   }

 

+  VA_END (Args);

+

   if (EFI_ERROR (Status)) {

     return Status;

   }

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Debug.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Debug.c
index ce257c4e1..eaf785bd3 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Debug.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Debug.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2005, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -113,6 +113,7 @@ Returns:
 

   VA_START (Marker, Format);

   EfiDebugVPrintWorker (ErrorLevel, Format, Marker, sizeof (Buffer), Buffer);

+  VA_END (Marker);

 

   //

   // We choose NOT to use PEI_REPORT_STATUS_CODE here, because when debug is enable,

@@ -127,5 +128,4 @@ Returns:
                     (EFI_STATUS_CODE_DATA *) Buffer

                     );

 

-  return ;

 }

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
index 2e6367258..d826b9000 100644
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -311,6 +311,8 @@ Returns:
     Status      = RegisterEsalFunction (FunctionId, ClassGuid, Function, ModuleGlobal);

   }

 

+  VA_END (Args);

+

   if (EFI_ERROR (Status)) {

     return Status;

   }