[PATCH V2 10/10] FmpDevicePkg/FmpDxe: Remove use of CatSprint()

["Eric Jin" <eric.jin@intel.com>]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1525

The size overhead for CatSPrint() is large.  This function
is only used to generate variable names with HardwareInstance
value appended.  Use UnicodeValueToStringS() instead that is
much smaller.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Eric Jin <eric.jin@intel.com>
---
 FmpDevicePkg/FmpDxe/FmpDxe.h          |  1 +
 FmpDevicePkg/FmpDxe/FmpDxe.inf        |  1 +
 FmpDevicePkg/FmpDxe/FmpDxeLib.inf     |  1 +
 FmpDevicePkg/FmpDxe/VariableSupport.c | 19 ++++++++++++++-----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.h b/FmpDevicePkg/FmpDxe/FmpDxe.h
index 28bfa41580..150f18b656 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxe.h
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.h
@@ -23,6 +23,7 @@
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiLib.h>
+#include <Library/PrintLib.h>
 #include <Library/FmpAuthenticationLib.h>
 #include <Library/FmpDeviceLib.h>
 #include <Library/FmpPayloadHeaderLib.h>
diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.inf b/FmpDevicePkg/FmpDxe/FmpDxe.inf
index 5487123935..bec73aa8fb 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxe.inf
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.inf
@@ -45,6 +45,7 @@
   BaseMemoryLib
   UefiBootServicesTableLib
   MemoryAllocationLib
+  PrintLib
   UefiLib
   BaseCryptLib
   FmpAuthenticationLib
diff --git a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
index ba762b0b77..edc0cd66c1 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
+++ b/FmpDevicePkg/FmpDxe/FmpDxeLib.inf
@@ -45,6 +45,7 @@
   BaseMemoryLib
   UefiBootServicesTableLib
   MemoryAllocationLib
+  PrintLib
   UefiLib
   BaseCryptLib
   FmpAuthenticationLib
diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/VariableSupport.c
index 6c1ecf7df9..86dd5b203b 100644
--- a/FmpDevicePkg/FmpDxe/VariableSupport.c
+++ b/FmpDevicePkg/FmpDxe/VariableSupport.c
@@ -147,9 +147,15 @@ GenerateFmpVariableName (
   IN  CHAR16  *BaseVariableName
   )
 {
+  UINTN   Size;
   CHAR16  *VariableName;
 
-  VariableName = CatSPrint (NULL, BaseVariableName);
+  //
+  // Allocate Unicode string with room for BaseVariableName and a 16 digit
+  // hexadecimal value for the HardwareInstance value.
+  //
+  Size = StrSize (BaseVariableName) + 16 * sizeof (CHAR16);
+  VariableName = AllocateCopyPool (Size, BaseVariableName);
   if (VariableName == NULL) {
     DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName));
     return VariableName;
@@ -157,10 +163,13 @@ GenerateFmpVariableName (
   if (HardwareInstance == 0) {
     return VariableName;
   }
-  VariableName = CatSPrint (VariableName, L"%016lx", HardwareInstance);
-  if (VariableName == NULL) {
-    DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to generate variable name %s.\n", mImageIdName, BaseVariableName));
-  }
+  UnicodeValueToStringS (
+    &VariableName[StrLen(BaseVariableName)],
+    Size,
+    PREFIX_ZERO | RADIX_HEX,
+    HardwareInstance,
+    16
+    );
   return VariableName;
 }
 
-- 
2.20.1.windows.1