BaseTools/CommonLib: avoid using 'native' word size in IP address handling

[mirror_edk2.git] / BaseTools / Source / C / Common / CommonLib.c

diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c
index 618aadac781a561f6f808dcf64022798d3463642..7c559bc3c222869a1a822a9935a62a376e9642ee 100644 (file)
--- a/BaseTools/Source/C/Common/CommonLib.c
+++ b/BaseTools/Source/C/Common/CommonLib.c
@@ -1785,7 +1785,7 @@ StrToIpv4Address (
 {\r
   RETURN_STATUS          Status;\r
   UINTN                  AddressIndex;\r
-  UINTN                  Uintn;\r
+  UINT64                 Uint64;\r
   EFI_IPv4_ADDRESS       LocalAddress;\r
   UINT8                  LocalPrefixLength;\r
   CHAR16                 *Pointer;\r
@@ -1812,7 +1812,7 @@ StrToIpv4Address (
     //\r
     // Get D or P.\r
     //\r
-    Status = StrDecimalToUintnS ((CONST CHAR16 *) Pointer, &Pointer, &Uintn);\r
+    Status = StrDecimalToUint64S ((CONST CHAR16 *) Pointer, &Pointer, &Uint64);\r
     if (RETURN_ERROR (Status)) {\r
       return RETURN_UNSUPPORTED;\r
     }\r
@@ -1820,18 +1820,18 @@ StrToIpv4Address (
       //\r
       // It's P.\r
       //\r
-      if (Uintn > 32) {\r
+      if (Uint64 > 32) {\r
         return RETURN_UNSUPPORTED;\r
       }\r
-      LocalPrefixLength = (UINT8) Uintn;\r
+      LocalPrefixLength = (UINT8) Uint64;\r
     } else {\r
       //\r
       // It's D.\r
       //\r
-      if (Uintn > MAX_UINT8) {\r
+      if (Uint64 > MAX_UINT8) {\r
         return RETURN_UNSUPPORTED;\r
       }\r
-      LocalAddress.Addr[AddressIndex] = (UINT8) Uintn;\r
+      LocalAddress.Addr[AddressIndex] = (UINT8) Uint64;\r
       AddressIndex++;\r
     }\r
 \r
@@ -1888,7 +1888,7 @@ StrToIpv6Address (
 {\r
   RETURN_STATUS          Status;\r
   UINTN                  AddressIndex;\r
-  UINTN                  Uintn;\r
+  UINT64                 Uint64;\r
   EFI_IPv6_ADDRESS       LocalAddress;\r
   UINT8                  LocalPrefixLength;\r
   CONST CHAR16           *Pointer;\r
@@ -1969,7 +1969,7 @@ StrToIpv6Address (
         //\r
         // Get X.\r
         //\r
-        Status = StrHexToUintnS (Pointer, &End, &Uintn);\r
+        Status = StrHexToUint64S (Pointer, &End, &Uint64);\r
         if (RETURN_ERROR (Status) || End - Pointer > 4) {\r
           //\r
           // Number of hexadecimal digit characters is no more than 4.\r
@@ -1978,24 +1978,24 @@ StrToIpv6Address (
         }\r
         Pointer = End;\r
         //\r
-        // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.\r
+        // Uint64 won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.\r
         //\r
         ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));\r
-        LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);\r
-        LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;\r
+        LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uint64 >> 8);\r
+        LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uint64;\r
         AddressIndex += 2;\r
       } else {\r
         //\r
         // Get P, then exit the loop.\r
         //\r
-        Status = StrDecimalToUintnS (Pointer, &End, &Uintn);\r
-        if (RETURN_ERROR (Status) || End == Pointer || Uintn > 128) {\r
+        Status = StrDecimalToUint64S (Pointer, &End, &Uint64);\r
+        if (RETURN_ERROR (Status) || End == Pointer || Uint64 > 128) {\r
           //\r
           // Prefix length should not exceed 128.\r
           //\r
           return RETURN_UNSUPPORTED;\r
         }\r
-        LocalPrefixLength = (UINT8) Uintn;\r
+        LocalPrefixLength = (UINT8) Uint64;\r
         Pointer = End;\r
         break;\r
       }\r