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

MdeModulePkg/Library/DxePrintLibPrint2Protocol/PrintLib.c

@@ -6,7 +6,7 @@
   protocol related to this implementation, not in the public spec. So, this 
   library instance is only for this code base.
 
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 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
@@ -366,9 +366,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;
 }
 
 /**
@@ -515,9 +518,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;
 }
 
 /**
@@ -714,9 +720,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;
 }
 
 /**
@@ -863,9 +872,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;
 }
 
 
@@ -1056,9 +1068,12 @@ InternalPrintLibSPrint (
   )
 {
   VA_LIST  Marker;
+  UINTN    NumberOfPrinted;
 
   VA_START (Marker, FormatString);
-  return InternalPrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);
+  NumberOfPrinted = InternalPrintLibSPrintMarker (StartOfBuffer, BufferSize, Flags, FormatString, Marker, NULL);
+  VA_END (Marker);
+  return NumberOfPrinted;
 }
 
 #define WARNING_STATUS_NUMBER         4

MdeModulePkg/Universal/EbcDxe/Ipf/EbcSupport.c

@@ -2,7 +2,7 @@
   This module contains EBC support routines that are customized based on
   the target processor.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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
@@ -134,6 +134,7 @@ EbcInterpret (
   Arg14     = VA_ARG (List, UINT64);
   Arg15     = VA_ARG (List, UINT64);
   Arg16     = VA_ARG (List, UINT64);
+  VA_END (List);
   //
   // Now clear out our context
   //

MdeModulePkg/Universal/SetupBrowserDxe/Print.c

@@ -15,7 +15,7 @@ type:
   '%' - Print a %
 
 
-Copyright (c) 2004 - 2007, 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
@@ -152,9 +152,12 @@ ConsolePrint (
   )
 {
   VA_LIST Args;
+  UINTN   LengthOfPrinted;
 
   VA_START (Args, Fmt);
-  return PrintInternal ((UINTN) -1, (UINTN) -1, gST->ConOut, Fmt, Args);
+  LengthOfPrinted = PrintInternal ((UINTN) -1, (UINTN) -1, gST->ConOut, Fmt, Args);
+  VA_END (Args);
+  return LengthOfPrinted;
 }
 
 
@@ -216,9 +219,12 @@ PrintAt (
   )
 {
   VA_LIST Args;
+  UINTN   LengthOfPrinted;
 
   VA_START (Args, Fmt);
-  return PrintInternal (Column, Row, gST->ConOut, Fmt, Args);
+  LengthOfPrinted = PrintInternal (Column, Row, gST->ConOut, Fmt, Args);
+  VA_END (Args);
+  return LengthOfPrinted;
 }
 
 

MdeModulePkg/Universal/SetupBrowserDxe/Ui.c

@@ -852,8 +852,6 @@ CreateDialog (
   ASSERT (TempString);
   ASSERT (BufferedString);
 
-  VA_START (Marker, KeyValue);
-
   //
   // Zero the outgoing buffer
   //
@@ -875,6 +873,8 @@ CreateDialog (
 
   LargestString = 0;
 
+  VA_START (Marker, KeyValue);
+
   //
   // Determine the largest string in the dialog box
   // Notice we are starting with 1 since String is the first string