EmbeddedPkg/Ebl: eliminate deprecated string function calls

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

diff --git a/EmbeddedPkg/Ebl/Variable.c b/EmbeddedPkg/Ebl/Variable.c
index f440c48f16dd02271afd8076aa316eaac0b77bf8..92464a6b7133396ff98f4b39451c341ae154c279 100644 (file)
--- a/EmbeddedPkg/Ebl/Variable.c
+++ b/EmbeddedPkg/Ebl/Variable.c
@@ -29,6 +29,7 @@ EblGetCmd (
   VOID*       Value;\r
   CHAR8*      AsciiVariableName = NULL;\r
   CHAR16*     VariableName;\r
   VOID*       Value;\r
   CHAR8*      AsciiVariableName = NULL;\r
   CHAR16*     VariableName;\r

+  UINTN       VariableNameLen;\r

   UINT32      Index;\r
 \r
   if (Argc == 1) {\r
   UINT32      Index;\r
 \r
   if (Argc == 1) {\r


@@ -48,8 +49,9 @@ EblGetCmd (
     AsciiPrint("Variable name is missing.\n");\r
     return Status;\r
   } else {\r
     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
   }\r
 \r
   // Try to get the variable size.\r


@@ -93,6 +95,7 @@ EblSetCmd (
   CHAR8*        AsciiValue;\r
   UINT32        AsciiValueLength;\r
   CHAR16*       VariableName;\r
   CHAR8*        AsciiValue;\r
   UINT32        AsciiValueLength;\r
   CHAR16*       VariableName;\r

+  UINTN         VariableNameLen;\r

   UINT32        Index;\r
   UINT32        EscapedQuotes = 0;\r
   BOOLEAN       Volatile = FALSE;\r
   UINT32        Index;\r
   UINT32        EscapedQuotes = 0;\r
   BOOLEAN       Volatile = FALSE;\r


@@ -125,8 +128,9 @@ EblSetCmd (
     //\r
 \r
     // Convert VariableName into Unicode\r
     //\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
 \r
     Status = gRT->SetVariable (\r
                           VariableName,\r


@@ -170,8 +174,9 @@ EblSetCmd (
   }\r
 \r
   // Convert VariableName into Unicode\r
   }\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
 \r
   Status = gRT->SetVariable (\r
                       VariableName,\r