diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-11-29 13:00:20 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-12-05 09:03:17 +0100 |
| commit | 93afbd1595cce37b0502d3d27f7411d94292f4d6 (patch) | |
| tree | 8986434ec81769f54ffb41d7905f3c57f865ac0a /BaseTools | |
| parent | 64ab2c82e8f61e881eb16849e1b188361b00c4a7 (diff) | |
| download | edk2-93afbd1595cce37b0502d3d27f7411d94292f4d6.zip edk2-93afbd1595cce37b0502d3d27f7411d94292f4d6.tar.gz edk2-93afbd1595cce37b0502d3d27f7411d94292f4d6.tar.bz2 | |
BaseTools/CommonLib: avoid using 'native' word size in IP address handling
In the context of the BaseTools, there is no such thing as a native word
size, given that the same set of tools may be used to build a firmware
image consisting of both 32-bit and 64-bit modules.
So update StrToIpv4Address() and StrToIpv6Address() to use UINT64
types instead of UINTN types when parsing strings.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/C/Common/CommonLib.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c index 618aada..7c559bc 100644 --- a/BaseTools/Source/C/Common/CommonLib.c +++ b/BaseTools/Source/C/Common/CommonLib.c @@ -1785,7 +1785,7 @@ StrToIpv4Address ( {
RETURN_STATUS Status;
UINTN AddressIndex;
- UINTN Uintn;
+ UINT64 Uint64;
EFI_IPv4_ADDRESS LocalAddress;
UINT8 LocalPrefixLength;
CHAR16 *Pointer;
@@ -1812,7 +1812,7 @@ StrToIpv4Address ( //
// Get D or P.
//
- Status = StrDecimalToUintnS ((CONST CHAR16 *) Pointer, &Pointer, &Uintn);
+ Status = StrDecimalToUint64S ((CONST CHAR16 *) Pointer, &Pointer, &Uint64);
if (RETURN_ERROR (Status)) {
return RETURN_UNSUPPORTED;
}
@@ -1820,18 +1820,18 @@ StrToIpv4Address ( //
// It's P.
//
- if (Uintn > 32) {
+ if (Uint64 > 32) {
return RETURN_UNSUPPORTED;
}
- LocalPrefixLength = (UINT8) Uintn;
+ LocalPrefixLength = (UINT8) Uint64;
} else {
//
// It's D.
//
- if (Uintn > MAX_UINT8) {
+ if (Uint64 > MAX_UINT8) {
return RETURN_UNSUPPORTED;
}
- LocalAddress.Addr[AddressIndex] = (UINT8) Uintn;
+ LocalAddress.Addr[AddressIndex] = (UINT8) Uint64;
AddressIndex++;
}
@@ -1888,7 +1888,7 @@ StrToIpv6Address ( {
RETURN_STATUS Status;
UINTN AddressIndex;
- UINTN Uintn;
+ UINT64 Uint64;
EFI_IPv6_ADDRESS LocalAddress;
UINT8 LocalPrefixLength;
CONST CHAR16 *Pointer;
@@ -1969,7 +1969,7 @@ StrToIpv6Address ( //
// Get X.
//
- Status = StrHexToUintnS (Pointer, &End, &Uintn);
+ Status = StrHexToUint64S (Pointer, &End, &Uint64);
if (RETURN_ERROR (Status) || End - Pointer > 4) {
//
// Number of hexadecimal digit characters is no more than 4.
@@ -1978,24 +1978,24 @@ StrToIpv6Address ( }
Pointer = End;
//
- // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.
+ // Uint64 won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.
//
ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));
- LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);
- LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
+ LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uint64 >> 8);
+ LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uint64;
AddressIndex += 2;
} else {
//
// Get P, then exit the loop.
//
- Status = StrDecimalToUintnS (Pointer, &End, &Uintn);
- if (RETURN_ERROR (Status) || End == Pointer || Uintn > 128) {
+ Status = StrDecimalToUint64S (Pointer, &End, &Uint64);
+ if (RETURN_ERROR (Status) || End == Pointer || Uint64 > 128) {
//
// Prefix length should not exceed 128.
//
return RETURN_UNSUPPORTED;
}
- LocalPrefixLength = (UINT8) Uintn;
+ LocalPrefixLength = (UINT8) Uint64;
Pointer = End;
break;
}
|