Replace some CopyMem() for GUID copy with CopyGuid().

[mirror_edk2.git] / IntelFrameworkPkg / Library / FrameworkIfrSupportLib / IfrVariable.c

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
index 533332b5a5ffb51c27a099bc527ef0acd4d54a3a..44b53571d4bf22d2442f902f2c25cf72263aa454 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
@@ -25,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @param  Size              Size of the variable/map in bytes\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackGetMap (\r
   IN      EFI_HII_VARIABLE_PACK     *Pack,  \r
      OUT  CHAR16                    **Name, OPTIONAL\r
@@ -64,6 +65,7 @@ EfiLibHiiVariablePackGetMap (
   @return                   The number of map count.\r
 **/\r
 UINTN\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapCnt (\r
   IN  EFI_HII_VARIABLE_PACK_LIST    *List\r
   )\r
@@ -86,6 +88,7 @@ EfiLibHiiVariablePackListGetMapCnt (
   @param  Callback          Routine to be called for each iterated variable.\r
 **/\r
 VOID\r
+EFIAPI\r
 EfiLibHiiVariablePackListForEachVar (\r
   IN  EFI_HII_VARIABLE_PACK_LIST               *List,\r
   IN  EFI_LIB_HII_VARIABLE_PACK_LIST_CALLBACK  *Callback\r
@@ -123,6 +126,7 @@ EfiLibHiiVariablePackListForEachVar (
   @return EFI_NOT_FOUND  Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapByIdx (\r
   IN      UINTN                      Idx,  \r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,  \r
@@ -156,8 +160,10 @@ EfiLibHiiVariablePackListGetMapByIdx (
       if (NULL != Id) {\r
         *Id   = MapId;\r
       }\r
-        \r
-      return EFI_SUCCESS; // Map found\r
+      //\r
+      // Map found\r
+      //\r
+      return EFI_SUCCESS;\r
     }\r
     List = List->NextVariablePack;\r
   }\r
@@ -182,6 +188,7 @@ EfiLibHiiVariablePackListGetMapByIdx (
   @retval EFI_NOT_FOUND  Variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMapById (\r
   IN      UINT16                     Id,  \r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,\r
@@ -235,6 +242,7 @@ EfiLibHiiVariablePackListGetMapById (
   @retval EFI_NOT_FOUND  variable is not found, OUT parameters are not valid\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariablePackListGetMap (\r
   IN      EFI_HII_VARIABLE_PACK_LIST *List,\r
   IN      CHAR16                     *Name,\r
@@ -282,6 +290,7 @@ EfiLibHiiVariablePackListGetMap (
   @retval EFI_LOAD_ERROR  The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableRetrieveFromNv (\r
   IN      CHAR16                    *Name,\r
   IN      EFI_GUID                  *Guid,\r
@@ -334,8 +343,8 @@ EfiLibHiiVariableRetrieveFromNv (
 \r
   @param  Suffix            Suffix the Name should end with.\r
   @param  Name              Name of the variable to retrieve.\r
-  @Param  Guid              Guid of the variable to retrieve.\r
-  @Param  Size              Parameters of the variable to retrieve.\r
+  @param  Guid              Guid of the variable to retrieve.\r
+  @param  Size              Parameters of the variable to retrieve.\r
   @param  Var               Variable will be retrieved into this buffer.\r
                             Caller is responsible for providing storage of exactly Size size in bytes.\r
 \r
@@ -345,6 +354,7 @@ EfiLibHiiVariableRetrieveFromNv (
   @retval EFI_LOAD_ERROR        The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideIfSuffix (\r
   IN      CHAR16                    *Suffix,\r
   IN      CHAR16                    *Name,\r
@@ -386,6 +396,7 @@ EfiLibHiiVariableOverrideIfSuffix (
   @retval EFI_LOAD_ERROR  The variable in the NV was of different size, or NV API returned error.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EfiLibHiiVariableOverrideBySuffix (\r
   IN      CHAR16                    *Suffix,\r
   IN      CHAR16                    *Name,\r
@@ -410,7 +421,7 @@ EfiLibHiiVariableOverrideBySuffix (
   StrCat (NameSuffixed, Suffix);\r
   \r
   Status = EfiLibHiiVariableRetrieveFromNv (NameSuffixed, Guid, Size, &Var);\r
-  gBS->FreePool (NameSuffixed);\r
+  FreePool (NameSuffixed);\r
   \r
   return Status;\r
 }\r