BaseTools/DevicePath: use explicit 64-bit number parsing routines

Replace invocations of StrHexToUintn() with StrHexToUint64(), so
that we can drop the former.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
index 555efa1acddeb181e880c7023dbbed3a4311db65..6151926af9aa92859b5903c4f05df4775b038c8c 100644 (file)
--- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
@@ -520,7 +520,7 @@ EisaIdFromText (
   return (((Text[0] - 'A' + 1) & 0x1f) << 10)\r
        + (((Text[1] - 'A' + 1) & 0x1f) <<  5)\r
        + (((Text[2] - 'A' + 1) & 0x1f) <<  0)\r
-       + (UINT32) (StrHexToUintn (&Text[3]) << 16)\r
+       + (UINT32) (StrHexToUint64 (&Text[3]) << 16)\r
        ;\r
 }\r
 \r
@@ -1506,7 +1506,7 @@ DevPathFromTextNVMe (
 \r
   Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8);\r
   while (Index-- != 0) {\r
-    Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));\r
+    Uuid[Index] = (UINT8) StrHexToUint64 (SplitStr (&NamespaceUuidStr, L'-'));\r
   }\r
 \r
   return (EFI_DEVICE_PATH_PROTOCOL *) Nvme;\r