ArmPlatformPkg: remove EblCmdLib implementation

[mirror_edk2.git] / EmbeddedPkg / Ebl / Variable.c

diff --git a/EmbeddedPkg/Ebl/Variable.c b/EmbeddedPkg/Ebl/Variable.c
index 5c00122cdb16e6c5b1611eeea69073c1827bee46..92464a6b7133396ff98f4b39451c341ae154c279 100644 (file)
--- a/EmbeddedPkg/Ebl/Variable.c
+++ b/EmbeddedPkg/Ebl/Variable.c
@@ -1,14 +1,15 @@
 /** @file\r
 *\r
 *  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*  \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
+*  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 *\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \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
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 *\r
 **/\r
 \r
@@ -17,6 +18,7 @@
 #include <Guid/GlobalVariable.h>\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblGetCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -27,6 +29,7 @@ EblGetCmd (
   VOID*       Value;\r
   CHAR8*      AsciiVariableName = NULL;\r
   CHAR16*     VariableName;\r
+  UINTN       VariableNameLen;\r
   UINT32      Index;\r
 \r
   if (Argc == 1) {\r
@@ -46,8 +49,9 @@ EblGetCmd (
     AsciiPrint("Variable name is missing.\n");\r
     return Status;\r
   } else {\r
-    VariableName = AllocatePool((AsciiStrLen (AsciiVariableName) + 1) * sizeof (CHAR16));\r
-    AsciiStrToUnicodeStr (AsciiVariableName,VariableName);\r
+    VariableNameLen = AsciiStrLen (AsciiVariableName) + 1;\r
+    VariableName = AllocatePool (VariableNameLen * sizeof (CHAR16));\r
+    AsciiStrToUnicodeStrS (AsciiVariableName, VariableName, VariableNameLen);\r
   }\r
 \r
   // Try to get the variable size.\r
@@ -79,6 +83,7 @@ EblGetCmd (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblSetCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -90,6 +95,7 @@ EblSetCmd (
   CHAR8*        AsciiValue;\r
   UINT32        AsciiValueLength;\r
   CHAR16*       VariableName;\r
+  UINTN         VariableNameLen;\r
   UINT32        Index;\r
   UINT32        EscapedQuotes = 0;\r
   BOOLEAN       Volatile = FALSE;\r
@@ -113,7 +119,7 @@ EblSetCmd (
     AsciiPrint("Variable name is missing.\n");\r
     return Status;\r
   }\r
-  \r
+\r
   // Check if it is a valid variable setting\r
   AsciiValue = AsciiStrStr (AsciiVariableSetting,"=");\r
   if (AsciiValue == NULL) {\r
@@ -122,8 +128,9 @@ EblSetCmd (
     //\r
 \r
     // Convert VariableName into Unicode\r
-    VariableName = AllocatePool((AsciiStrLen (AsciiVariableSetting) + 1) * sizeof (CHAR16));\r
-    AsciiStrToUnicodeStr (AsciiVariableSetting,VariableName);\r
+    VariableNameLen = AsciiStrLen (AsciiVariableSetting) + 1;\r
+    VariableName = AllocatePool (VariableNameLen * sizeof (CHAR16));\r
+    AsciiStrToUnicodeStrS (AsciiVariableSetting, VariableName, VariableNameLen);\r
 \r
     Status = gRT->SetVariable (\r
                           VariableName,\r
@@ -167,8 +174,9 @@ EblSetCmd (
   }\r
 \r
   // Convert VariableName into Unicode\r
-  VariableName = AllocatePool((AsciiStrLen (AsciiVariableName) + 1) * sizeof (CHAR16));\r
-  AsciiStrToUnicodeStr (AsciiVariableName,VariableName);\r
+  VariableNameLen = AsciiStrLen (AsciiVariableName) + 1;\r
+  VariableName = AllocatePool (VariableNameLen * sizeof (CHAR16));\r
+  AsciiStrToUnicodeStrS (AsciiVariableName, VariableName, VariableNameLen);\r
 \r
   Status = gRT->SetVariable (\r
                       VariableName,\r