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

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / RuntimeDxe / EfiRuntimeLib / Ipf / RuntimeLib.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
index ae66cf43e0ccf21db8d023a37362f5d4d060f0e3..d826b9000e05056063e5261a9f90305e2763083e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Ipf/RuntimeLib.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2005, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -164,7 +164,7 @@ Returns:
   // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it\r
   // away. We cache it in a module global, so we can register the vitrual version.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);\r
+  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, (VOID **) &mEsalBootService);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Plabel              = (EFI_PLABEL *) (UINTN) mEsalBootService->ExtendedSalProc;\r
@@ -311,6 +311,8 @@ Returns:
     Status      = RegisterEsalFunction (FunctionId, ClassGuid, Function, ModuleGlobal);\r
   }\r
 \r
+  VA_END (Args);\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -575,7 +577,7 @@ EfiGetNextHighMonotonicCount (
 \r
 Routine Description:\r
 \r
-  Returns the next high 32 bits of the platform¡¯s monotonic counter.\r
+  Returns the next high 32 bits of the platform's monotonic counter.\r
 \r
 Arguments:\r
 \r
@@ -614,7 +616,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - If not NULL, a pointer to the memory location to return the\r
                   attributes bitmask for the variable.\r
@@ -708,7 +710,7 @@ Routine Description:
 Arguments:\r
 \r
   VariableName  - A Null-terminated Unicode string that is the name of the\r
-                  vendor¡¯s variable.\r
+                  vendor's variable.\r
   VendorGuid    - A unique identifier for the vendor.\r
   Attributes    - Attributes bitmask to set for the variable.\r
   DataSize      - The size in bytes of the Data buffer.\r
@@ -806,7 +808,7 @@ Routine Description:
 Arguments:\r
 \r
   Time          - A pointer to storage to receive a snapshot of the current time.\r
-  Capabilities  - An optional pointer to a buffer to receive the real time clock device¡¯s\r
+  Capabilities  - An optional pointer to a buffer to receive the real time clock device's\r
                   capabilities.\r
 \r
 Returns:\r
@@ -947,6 +949,7 @@ Returns:
   EFI_GUID Guid = EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, IoRead, (UINT64) Width, Address, Count, (UINT64) Buffer, 0, 0, 0);\r
+  ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
 \r
   return ReturnReg.Status;\r
 \r
@@ -1015,6 +1018,7 @@ Returns:
   EFI_GUID Guid = EFI_EXTENDED_SAL_BASE_IO_SERVICES_PROTOCOL_GUID;\r
 \r
   ReturnReg = EfiCallEsalService (&Guid, MemRead, (UINT64) Width, Address, Count, (UINT64) Buffer, 0, 0, 0);\r
+  ASSERT (ReturnReg.Status == EFI_SAL_SUCCESS);\r
 \r
   return ReturnReg.Status;\r
 \r