**/\r
BOOLEAN\r
InternalSafeStringIsOverlap (\r
- IN VOID *Base1,\r
- IN UINTN Size1,\r
- IN VOID *Base2,\r
- IN UINTN Size2\r
+ IN VOID *Base1,\r
+ IN UINTN Size1,\r
+ IN VOID *Base2,\r
+ IN UINTN Size2\r
)\r
{\r
if ((((UINTN)Base1 >= (UINTN)Base2) && ((UINTN)Base1 < (UINTN)Base2 + Size2)) ||\r
- (((UINTN)Base2 >= (UINTN)Base1) && ((UINTN)Base2 < (UINTN)Base1 + Size1))) {\r
+ (((UINTN)Base2 >= (UINTN)Base1) && ((UINTN)Base2 < (UINTN)Base1 + Size1)))\r
+ {\r
return TRUE;\r
}\r
+\r
return FALSE;\r
}\r
\r
IN UINTN Size2\r
)\r
{\r
- return !InternalSafeStringIsOverlap (Str1, Size1 * sizeof(CHAR16), Str2, Size2 * sizeof(CHAR16));\r
+ return !InternalSafeStringIsOverlap (Str1, Size1 * sizeof (CHAR16), Str2, Size2 * sizeof (CHAR16));\r
}\r
\r
/**\r
**/\r
BOOLEAN\r
InternalSafeStringNoAsciiStrOverlap (\r
- IN CHAR8 *Str1,\r
- IN UINTN Size1,\r
- IN CHAR8 *Str2,\r
- IN UINTN Size2\r
+ IN CHAR8 *Str1,\r
+ IN UINTN Size1,\r
+ IN CHAR8 *Str2,\r
+ IN UINTN Size2\r
)\r
{\r
return !InternalSafeStringIsOverlap (Str1, Size1, Str2, Size2);\r
UINTN\r
EFIAPI\r
StrnLenS (\r
- IN CONST CHAR16 *String,\r
- IN UINTN MaxSize\r
+ IN CONST CHAR16 *String,\r
+ IN UINTN MaxSize\r
)\r
{\r
- UINTN Length;\r
+ UINTN Length;\r
\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// If String is a null pointer or MaxSize is 0, then the StrnLenS function returns zero.\r
if (Length >= MaxSize - 1) {\r
return MaxSize;\r
}\r
+\r
Length++;\r
}\r
+\r
return Length;\r
}\r
\r
UINTN\r
EFIAPI\r
StrnSizeS (\r
- IN CONST CHAR16 *String,\r
- IN UINTN MaxSize\r
+ IN CONST CHAR16 *String,\r
+ IN UINTN MaxSize\r
)\r
{\r
//\r
RETURN_STATUS\r
EFIAPI\r
StrCpyS (\r
- OUT CHAR16 *Destination,\r
- IN UINTN DestMax,\r
- IN CONST CHAR16 *Source\r
+ OUT CHAR16 *Destination,\r
+ IN UINTN DestMax,\r
+ IN CONST CHAR16 *Source\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
while (*Source != 0) {\r
*(Destination++) = *(Source++);\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
StrnCpyS (\r
- OUT CHAR16 *Destination,\r
- IN UINTN DestMax,\r
- IN CONST CHAR16 *Source,\r
- IN UINTN Length\r
+ OUT CHAR16 *Destination,\r
+ IN UINTN DestMax,\r
+ IN CONST CHAR16 *Source,\r
+ IN UINTN Length\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
+\r
SAFE_STRING_CONSTRAINT_CHECK (InternalSafeStringNoStrOverlap (Destination, DestMax, (CHAR16 *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
//\r
*(Destination++) = *(Source++);\r
SourceLen--;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
StrCatS (\r
- IN OUT CHAR16 *Destination,\r
- IN UINTN DestMax,\r
- IN CONST CHAR16 *Source\r
+ IN OUT CHAR16 *Destination,\r
+ IN UINTN DestMax,\r
+ IN CONST CHAR16 *Source\r
)\r
{\r
- UINTN DestLen;\r
- UINTN CopyLen;\r
- UINTN SourceLen;\r
+ UINTN DestLen;\r
+ UINTN CopyLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// Let CopyLen denote the value DestMax - StrnLenS(Destination, DestMax) upon entry to StrCatS.\r
while (*Source != 0) {\r
*(Destination++) = *(Source++);\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
StrnCatS (\r
- IN OUT CHAR16 *Destination,\r
- IN UINTN DestMax,\r
- IN CONST CHAR16 *Source,\r
- IN UINTN Length\r
+ IN OUT CHAR16 *Destination,\r
+ IN UINTN DestMax,\r
+ IN CONST CHAR16 *Source,\r
+ IN UINTN Length\r
)\r
{\r
- UINTN DestLen;\r
- UINTN CopyLen;\r
- UINTN SourceLen;\r
+ UINTN DestLen;\r
+ UINTN CopyLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// Let CopyLen denote the value DestMax - StrnLenS(Destination, DestMax) upon entry to StrnCatS.\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
+\r
SAFE_STRING_CONSTRAINT_CHECK (InternalSafeStringNoStrOverlap (Destination, DestMax, (CHAR16 *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
//\r
*(Destination++) = *(Source++);\r
SourceLen--;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
StrDecimalToUintnS (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT UINTN *Data\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT UINTN *Data\r
)\r
{\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. Neither String nor Data shall be a null pointer.\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
\r
//\r
if (*Data > ((MAX_UINTN - (*String - L'0')) / 10)) {\r
*Data = MAX_UINTN;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
StrDecimalToUint64S (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT UINT64 *Data\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT UINT64 *Data\r
)\r
{\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. Neither String nor Data shall be a null pointer.\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
\r
//\r
if (*Data > DivU64x32 (MAX_UINT64 - (*String - L'0'), 10)) {\r
*Data = MAX_UINT64;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
StrHexToUintnS (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT UINTN *Data\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT UINTN *Data\r
)\r
{\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. Neither String nor Data shall be a null pointer.\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
\r
//\r
*Data = 0;\r
return RETURN_SUCCESS;\r
}\r
+\r
//\r
// Skip the 'X'\r
//\r
if (*Data > ((MAX_UINTN - InternalHexCharToUintn (*String)) >> 4)) {\r
*Data = MAX_UINTN;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
StrHexToUint64S (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT UINT64 *Data\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT UINT64 *Data\r
)\r
{\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. Neither String nor Data shall be a null pointer.\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
\r
//\r
*Data = 0;\r
return RETURN_SUCCESS;\r
}\r
+\r
//\r
// Skip the 'X'\r
//\r
if (*Data > RShiftU64 (MAX_UINT64 - InternalHexCharToUintn (*String), 4)) {\r
*Data = MAX_UINT64;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) String;\r
+ *EndPointer = (CHAR16 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
StrToIpv6Address (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT IPv6_ADDRESS *Address,\r
- OUT UINT8 *PrefixLength OPTIONAL\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT IPv6_ADDRESS *Address,\r
+ OUT UINT8 *PrefixLength OPTIONAL\r
)\r
{\r
- RETURN_STATUS Status;\r
- UINTN AddressIndex;\r
- UINTN Uintn;\r
- IPv6_ADDRESS LocalAddress;\r
- UINT8 LocalPrefixLength;\r
- CONST CHAR16 *Pointer;\r
- CHAR16 *End;\r
- UINTN CompressStart;\r
- BOOLEAN ExpectPrefix;\r
+ RETURN_STATUS Status;\r
+ UINTN AddressIndex;\r
+ UINTN Uintn;\r
+ IPv6_ADDRESS LocalAddress;\r
+ UINT8 LocalPrefixLength;\r
+ CONST CHAR16 *Pointer;\r
+ CHAR16 *End;\r
+ UINTN CompressStart;\r
+ BOOLEAN ExpectPrefix;\r
\r
LocalPrefixLength = MAX_UINT8;\r
CompressStart = ARRAY_SIZE (Address->Addr);\r
ExpectPrefix = FALSE;\r
\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. None of String or Guid shall be a null pointer.\r
return RETURN_UNSUPPORTED;\r
}\r
\r
- if (CompressStart != ARRAY_SIZE (Address->Addr) || AddressIndex == ARRAY_SIZE (Address->Addr)) {\r
+ if ((CompressStart != ARRAY_SIZE (Address->Addr)) || (AddressIndex == ARRAY_SIZE (Address->Addr))) {\r
//\r
// "::" can only appear once.\r
// "::" can only appear when address is not full length.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
Pointer++;\r
}\r
}\r
// Get X.\r
//\r
Status = StrHexToUintnS (Pointer, &End, &Uintn);\r
- if (RETURN_ERROR (Status) || End - Pointer > 4) {\r
+ if (RETURN_ERROR (Status) || (End - Pointer > 4)) {\r
//\r
// Number of hexadecimal digit characters is no more than 4.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
Pointer = End;\r
//\r
// Uintn 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
- AddressIndex += 2;\r
+ LocalAddress.Addr[AddressIndex] = (UINT8)((UINT16)Uintn >> 8);\r
+ LocalAddress.Addr[AddressIndex + 1] = (UINT8)Uintn;\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
+ if (RETURN_ERROR (Status) || (End == Pointer) || (Uintn > 128)) {\r
//\r
// Prefix length should not exceed 128.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalPrefixLength = (UINT8) Uintn;\r
- Pointer = End;\r
+\r
+ LocalPrefixLength = (UINT8)Uintn;\r
+ Pointer = End;\r
break;\r
}\r
}\r
//\r
break;\r
}\r
+\r
Pointer++;\r
}\r
\r
- if ((AddressIndex == ARRAY_SIZE (Address->Addr) && CompressStart != ARRAY_SIZE (Address->Addr)) ||\r
- (AddressIndex != ARRAY_SIZE (Address->Addr) && CompressStart == ARRAY_SIZE (Address->Addr))\r
- ) {\r
+ if (((AddressIndex == ARRAY_SIZE (Address->Addr)) && (CompressStart != ARRAY_SIZE (Address->Addr))) ||\r
+ ((AddressIndex != ARRAY_SIZE (Address->Addr)) && (CompressStart == ARRAY_SIZE (Address->Addr)))\r
+ )\r
+ {\r
//\r
// Full length of address shall not have compressing zeros.\r
// Non-full length of address shall have compressing zeros.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);\r
ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);\r
if (AddressIndex > CompressStart) {\r
if (PrefixLength != NULL) {\r
*PrefixLength = LocalPrefixLength;\r
}\r
+\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR16 *) Pointer;\r
+ *EndPointer = (CHAR16 *)Pointer;\r
}\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
StrToIpv4Address (\r
- IN CONST CHAR16 *String,\r
- OUT CHAR16 **EndPointer OPTIONAL,\r
- OUT IPv4_ADDRESS *Address,\r
- OUT UINT8 *PrefixLength OPTIONAL\r
+ IN CONST CHAR16 *String,\r
+ OUT CHAR16 **EndPointer OPTIONAL,\r
+ OUT IPv4_ADDRESS *Address,\r
+ OUT UINT8 *PrefixLength OPTIONAL\r
)\r
{\r
- RETURN_STATUS Status;\r
- UINTN AddressIndex;\r
- UINTN Uintn;\r
- IPv4_ADDRESS LocalAddress;\r
- UINT8 LocalPrefixLength;\r
- CHAR16 *Pointer;\r
+ RETURN_STATUS Status;\r
+ UINTN AddressIndex;\r
+ UINTN Uintn;\r
+ IPv4_ADDRESS LocalAddress;\r
+ UINT8 LocalPrefixLength;\r
+ CHAR16 *Pointer;\r
\r
LocalPrefixLength = MAX_UINT8;\r
\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. None of String or Guid shall be a null pointer.\r
SAFE_STRING_CONSTRAINT_CHECK ((String != NULL), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((Address != NULL), RETURN_INVALID_PARAMETER);\r
\r
- for (Pointer = (CHAR16 *) String, AddressIndex = 0; AddressIndex < ARRAY_SIZE (Address->Addr) + 1;) {\r
+ for (Pointer = (CHAR16 *)String, AddressIndex = 0; AddressIndex < ARRAY_SIZE (Address->Addr) + 1;) {\r
if (!InternalIsDecimalDigitCharacter (*Pointer)) {\r
//\r
// D or P contains invalid characters.\r
//\r
// Get D or P.\r
//\r
- Status = StrDecimalToUintnS ((CONST CHAR16 *) Pointer, &Pointer, &Uintn);\r
+ Status = StrDecimalToUintnS ((CONST CHAR16 *)Pointer, &Pointer, &Uintn);\r
if (RETURN_ERROR (Status)) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
if (AddressIndex == ARRAY_SIZE (Address->Addr)) {\r
//\r
// It's P.\r
if (Uintn > 32) {\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalPrefixLength = (UINT8) Uintn;\r
+\r
+ LocalPrefixLength = (UINT8)Uintn;\r
} else {\r
//\r
// It's D.\r
if (Uintn > MAX_UINT8) {\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalAddress.Addr[AddressIndex] = (UINT8) Uintn;\r
+\r
+ LocalAddress.Addr[AddressIndex] = (UINT8)Uintn;\r
AddressIndex++;\r
}\r
\r
if (PrefixLength != NULL) {\r
*PrefixLength = LocalPrefixLength;\r
}\r
+\r
if (EndPointer != NULL) {\r
*EndPointer = Pointer;\r
}\r
RETURN_STATUS\r
EFIAPI\r
StrToGuid (\r
- IN CONST CHAR16 *String,\r
- OUT GUID *Guid\r
+ IN CONST CHAR16 *String,\r
+ OUT GUID *Guid\r
)\r
{\r
- RETURN_STATUS Status;\r
- GUID LocalGuid;\r
+ RETURN_STATUS Status;\r
+ GUID LocalGuid;\r
\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. None of String or Guid shall be a null pointer.\r
//\r
// Get aabbccdd in big-endian.\r
//\r
- Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data1), (UINT8 *) &LocalGuid.Data1, sizeof (LocalGuid.Data1));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data1)] != L'-') {\r
+ Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data1), (UINT8 *)&LocalGuid.Data1, sizeof (LocalGuid.Data1));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data1)] != L'-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data1 = SwapBytes32 (LocalGuid.Data1);\r
- String += 2 * sizeof (LocalGuid.Data1) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data1) + 1;\r
\r
//\r
// Get eeff in big-endian.\r
//\r
- Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data2), (UINT8 *) &LocalGuid.Data2, sizeof (LocalGuid.Data2));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data2)] != L'-') {\r
+ Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data2), (UINT8 *)&LocalGuid.Data2, sizeof (LocalGuid.Data2));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data2)] != L'-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data2 = SwapBytes16 (LocalGuid.Data2);\r
- String += 2 * sizeof (LocalGuid.Data2) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data2) + 1;\r
\r
//\r
// Get gghh in big-endian.\r
//\r
- Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data3), (UINT8 *) &LocalGuid.Data3, sizeof (LocalGuid.Data3));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data3)] != L'-') {\r
+ Status = StrHexToBytes (String, 2 * sizeof (LocalGuid.Data3), (UINT8 *)&LocalGuid.Data3, sizeof (LocalGuid.Data3));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data3)] != L'-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data3 = SwapBytes16 (LocalGuid.Data3);\r
- String += 2 * sizeof (LocalGuid.Data3) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data3) + 1;\r
\r
//\r
// Get iijj.\r
//\r
Status = StrHexToBytes (String, 2 * 2, &LocalGuid.Data4[0], 2);\r
- if (RETURN_ERROR (Status) || String[2 * 2] != L'-') {\r
+ if (RETURN_ERROR (Status) || (String[2 * 2] != L'-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
String += 2 * 2 + 1;\r
\r
//\r
RETURN_STATUS\r
EFIAPI\r
StrHexToBytes (\r
- IN CONST CHAR16 *String,\r
- IN UINTN Length,\r
- OUT UINT8 *Buffer,\r
- IN UINTN MaxBufferSize\r
+ IN CONST CHAR16 *String,\r
+ IN UINTN Length,\r
+ OUT UINT8 *Buffer,\r
+ IN UINTN MaxBufferSize\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
- ASSERT (((UINTN) String & BIT0) == 0);\r
+ ASSERT (((UINTN)String & BIT0) == 0);\r
\r
//\r
// 1. None of String or Buffer shall be a null pointer.\r
break;\r
}\r
}\r
+\r
if (Index != Length) {\r
return RETURN_UNSUPPORTED;\r
}\r
//\r
// Convert the hex string to bytes.\r
//\r
- for(Index = 0; Index < Length; Index++) {\r
-\r
+ for (Index = 0; Index < Length; Index++) {\r
//\r
// For even characters, write the upper nibble for each buffer byte,\r
// and for even characters, the lower nibble.\r
//\r
if ((Index & BIT0) == 0) {\r
- Buffer[Index / 2] = (UINT8) InternalHexCharToUintn (String[Index]) << 4;\r
+ Buffer[Index / 2] = (UINT8)InternalHexCharToUintn (String[Index]) << 4;\r
} else {\r
- Buffer[Index / 2] |= (UINT8) InternalHexCharToUintn (String[Index]);\r
+ Buffer[Index / 2] |= (UINT8)InternalHexCharToUintn (String[Index]);\r
}\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
UINTN\r
EFIAPI\r
AsciiStrnLenS (\r
- IN CONST CHAR8 *String,\r
- IN UINTN MaxSize\r
+ IN CONST CHAR8 *String,\r
+ IN UINTN MaxSize\r
)\r
{\r
- UINTN Length;\r
+ UINTN Length;\r
\r
//\r
// If String is a null pointer or MaxSize is 0, then the AsciiStrnLenS function returns zero.\r
if (Length >= MaxSize - 1) {\r
return MaxSize;\r
}\r
+\r
Length++;\r
}\r
+\r
return Length;\r
}\r
\r
UINTN\r
EFIAPI\r
AsciiStrnSizeS (\r
- IN CONST CHAR8 *String,\r
- IN UINTN MaxSize\r
+ IN CONST CHAR8 *String,\r
+ IN UINTN MaxSize\r
)\r
{\r
//\r
IN CONST CHAR8 *Source\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
while (*Source != 0) {\r
*(Destination++) = *(Source++);\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
IN UINTN Length\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
+\r
SAFE_STRING_CONSTRAINT_CHECK (InternalSafeStringNoAsciiStrOverlap (Destination, DestMax, (CHAR8 *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
//\r
*(Destination++) = *(Source++);\r
SourceLen--;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
IN CONST CHAR8 *Source\r
)\r
{\r
- UINTN DestLen;\r
- UINTN CopyLen;\r
- UINTN SourceLen;\r
+ UINTN DestLen;\r
+ UINTN CopyLen;\r
+ UINTN SourceLen;\r
\r
//\r
// Let CopyLen denote the value DestMax - AsciiStrnLenS(Destination, DestMax) upon entry to AsciiStrCatS.\r
while (*Source != 0) {\r
*(Destination++) = *(Source++);\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
IN UINTN Length\r
)\r
{\r
- UINTN DestLen;\r
- UINTN CopyLen;\r
- UINTN SourceLen;\r
+ UINTN DestLen;\r
+ UINTN CopyLen;\r
+ UINTN SourceLen;\r
\r
//\r
// Let CopyLen denote the value DestMax - AsciiStrnLenS(Destination, DestMax) upon entry to AsciiStrnCatS.\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
+\r
SAFE_STRING_CONSTRAINT_CHECK (InternalSafeStringNoAsciiStrOverlap (Destination, DestMax, (CHAR8 *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
//\r
*(Destination++) = *(Source++);\r
SourceLen--;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrDecimalToUintnS (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT UINTN *Data\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT UINTN *Data\r
)\r
{\r
//\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
\r
//\r
if (*Data > ((MAX_UINTN - (*String - '0')) / 10)) {\r
*Data = MAX_UINTN;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrDecimalToUint64S (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT UINT64 *Data\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT UINT64 *Data\r
)\r
{\r
//\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
\r
//\r
if (*Data > DivU64x32 (MAX_UINT64 - (*String - '0'), 10)) {\r
*Data = MAX_UINT64;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrHexToUintnS (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT UINTN *Data\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT UINTN *Data\r
)\r
{\r
//\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
\r
//\r
*Data = 0;\r
return RETURN_SUCCESS;\r
}\r
+\r
//\r
// Skip the 'X'\r
//\r
if (*Data > ((MAX_UINTN - InternalAsciiHexCharToUintn (*String)) >> 4)) {\r
*Data = MAX_UINTN;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrHexToUint64S (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT UINT64 *Data\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT UINT64 *Data\r
)\r
{\r
//\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
\r
//\r
*Data = 0;\r
return RETURN_SUCCESS;\r
}\r
+\r
//\r
// Skip the 'X'\r
//\r
if (*Data > RShiftU64 (MAX_UINT64 - InternalAsciiHexCharToUintn (*String), 4)) {\r
*Data = MAX_UINT64;\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_UNSUPPORTED;\r
}\r
\r
}\r
\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) String;\r
+ *EndPointer = (CHAR8 *)String;\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
\r
RETURN_STATUS\r
EFIAPI\r
UnicodeStrToAsciiStrS (\r
- IN CONST CHAR16 *Source,\r
- OUT CHAR8 *Destination,\r
- IN UINTN DestMax\r
+ IN CONST CHAR16 *Source,\r
+ OUT CHAR8 *Destination,\r
+ IN UINTN DestMax\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
if (ASCII_RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
+\r
if (RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
//\r
// 5. Copying shall not take place between objects that overlap.\r
//\r
- SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax, (VOID *)Source, (SourceLen + 1) * sizeof(CHAR16)), RETURN_ACCESS_DENIED);\r
+ SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax, (VOID *)Source, (SourceLen + 1) * sizeof (CHAR16)), RETURN_ACCESS_DENIED);\r
\r
//\r
// convert string\r
// non-zero value in the upper 8 bits, then ASSERT().\r
//\r
ASSERT (*Source < 0x100);\r
- *(Destination++) = (CHAR8) *(Source++);\r
+ *(Destination++) = (CHAR8)*(Source++);\r
}\r
+\r
*Destination = '\0';\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
UnicodeStrnToAsciiStrS (\r
- IN CONST CHAR16 *Source,\r
- IN UINTN Length,\r
- OUT CHAR8 *Destination,\r
- IN UINTN DestMax,\r
- OUT UINTN *DestinationLength\r
+ IN CONST CHAR16 *Source,\r
+ IN UINTN Length,\r
+ OUT CHAR8 *Destination,\r
+ IN UINTN DestMax,\r
+ OUT UINTN *DestinationLength\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Source & BIT0) == 0);\r
+ ASSERT (((UINTN)Source & BIT0) == 0);\r
\r
//\r
// 1. None of Destination, Source or DestinationLength shall be a null\r
SAFE_STRING_CONSTRAINT_CHECK ((Length <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
+\r
if (RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((Length <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
- SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax, (VOID *)Source, (SourceLen + 1) * sizeof(CHAR16)), RETURN_ACCESS_DENIED);\r
+\r
+ SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax, (VOID *)Source, (SourceLen + 1) * sizeof (CHAR16)), RETURN_ACCESS_DENIED);\r
\r
*DestinationLength = 0;\r
\r
// 8 bits, then ASSERT().\r
//\r
ASSERT (*Source < 0x100);\r
- *(Destination++) = (CHAR8) *(Source++);\r
+ *(Destination++) = (CHAR8)*(Source++);\r
SourceLen--;\r
(*DestinationLength)++;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrToUnicodeStrS (\r
- IN CONST CHAR8 *Source,\r
- OUT CHAR16 *Destination,\r
- IN UINTN DestMax\r
+ IN CONST CHAR8 *Source,\r
+ OUT CHAR16 *Destination,\r
+ IN UINTN DestMax\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
\r
//\r
// 1. Neither Destination nor Source shall be a null pointer.\r
if (RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
+\r
if (ASCII_RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
//\r
// 5. Copying shall not take place between objects that overlap.\r
//\r
- SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax * sizeof(CHAR16), (VOID *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
+ SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax * sizeof (CHAR16), (VOID *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
//\r
// Convert string\r
while (*Source != '\0') {\r
*(Destination++) = (CHAR16)(UINT8)*(Source++);\r
}\r
+\r
*Destination = '\0';\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrnToUnicodeStrS (\r
- IN CONST CHAR8 *Source,\r
- IN UINTN Length,\r
- OUT CHAR16 *Destination,\r
- IN UINTN DestMax,\r
- OUT UINTN *DestinationLength\r
+ IN CONST CHAR8 *Source,\r
+ IN UINTN Length,\r
+ OUT CHAR16 *Destination,\r
+ IN UINTN DestMax,\r
+ OUT UINTN *DestinationLength\r
)\r
{\r
- UINTN SourceLen;\r
+ UINTN SourceLen;\r
\r
- ASSERT (((UINTN) Destination & BIT0) == 0);\r
+ ASSERT (((UINTN)Destination & BIT0) == 0);\r
\r
//\r
// 1. None of Destination, Source or DestinationLength shall be a null\r
SAFE_STRING_CONSTRAINT_CHECK ((Length <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
}\r
+\r
if (ASCII_RSIZE_MAX != 0) {\r
SAFE_STRING_CONSTRAINT_CHECK ((Length <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((DestMax <= ASCII_RSIZE_MAX), RETURN_INVALID_PARAMETER);\r
if (SourceLen > Length) {\r
SourceLen = Length;\r
}\r
- SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax * sizeof(CHAR16), (VOID *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
+\r
+ SAFE_STRING_CONSTRAINT_CHECK (!InternalSafeStringIsOverlap (Destination, DestMax * sizeof (CHAR16), (VOID *)Source, SourceLen + 1), RETURN_ACCESS_DENIED);\r
\r
*DestinationLength = 0;\r
\r
SourceLen--;\r
(*DestinationLength)++;\r
}\r
+\r
*Destination = 0;\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrToIpv6Address (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT IPv6_ADDRESS *Address,\r
- OUT UINT8 *PrefixLength OPTIONAL\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT IPv6_ADDRESS *Address,\r
+ OUT UINT8 *PrefixLength OPTIONAL\r
)\r
{\r
- RETURN_STATUS Status;\r
- UINTN AddressIndex;\r
- UINTN Uintn;\r
- IPv6_ADDRESS LocalAddress;\r
- UINT8 LocalPrefixLength;\r
- CONST CHAR8 *Pointer;\r
- CHAR8 *End;\r
- UINTN CompressStart;\r
- BOOLEAN ExpectPrefix;\r
+ RETURN_STATUS Status;\r
+ UINTN AddressIndex;\r
+ UINTN Uintn;\r
+ IPv6_ADDRESS LocalAddress;\r
+ UINT8 LocalPrefixLength;\r
+ CONST CHAR8 *Pointer;\r
+ CHAR8 *End;\r
+ UINTN CompressStart;\r
+ BOOLEAN ExpectPrefix;\r
\r
LocalPrefixLength = MAX_UINT8;\r
CompressStart = ARRAY_SIZE (Address->Addr);\r
return RETURN_UNSUPPORTED;\r
}\r
\r
- if (CompressStart != ARRAY_SIZE (Address->Addr) || AddressIndex == ARRAY_SIZE (Address->Addr)) {\r
+ if ((CompressStart != ARRAY_SIZE (Address->Addr)) || (AddressIndex == ARRAY_SIZE (Address->Addr))) {\r
//\r
// "::" can only appear once.\r
// "::" can only appear when address is not full length.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
Pointer++;\r
}\r
}\r
// Get X.\r
//\r
Status = AsciiStrHexToUintnS (Pointer, &End, &Uintn);\r
- if (RETURN_ERROR (Status) || End - Pointer > 4) {\r
+ if (RETURN_ERROR (Status) || (End - Pointer > 4)) {\r
//\r
// Number of hexadecimal digit characters is no more than 4.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
Pointer = End;\r
//\r
// Uintn 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
- AddressIndex += 2;\r
+ LocalAddress.Addr[AddressIndex] = (UINT8)((UINT16)Uintn >> 8);\r
+ LocalAddress.Addr[AddressIndex + 1] = (UINT8)Uintn;\r
+ AddressIndex += 2;\r
} else {\r
//\r
// Get P, then exit the loop.\r
//\r
Status = AsciiStrDecimalToUintnS (Pointer, &End, &Uintn);\r
- if (RETURN_ERROR (Status) || End == Pointer || Uintn > 128) {\r
+ if (RETURN_ERROR (Status) || (End == Pointer) || (Uintn > 128)) {\r
//\r
// Prefix length should not exceed 128.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalPrefixLength = (UINT8) Uintn;\r
- Pointer = End;\r
+\r
+ LocalPrefixLength = (UINT8)Uintn;\r
+ Pointer = End;\r
break;\r
}\r
}\r
//\r
break;\r
}\r
+\r
Pointer++;\r
}\r
\r
- if ((AddressIndex == ARRAY_SIZE (Address->Addr) && CompressStart != ARRAY_SIZE (Address->Addr)) ||\r
- (AddressIndex != ARRAY_SIZE (Address->Addr) && CompressStart == ARRAY_SIZE (Address->Addr))\r
- ) {\r
+ if (((AddressIndex == ARRAY_SIZE (Address->Addr)) && (CompressStart != ARRAY_SIZE (Address->Addr))) ||\r
+ ((AddressIndex != ARRAY_SIZE (Address->Addr)) && (CompressStart == ARRAY_SIZE (Address->Addr)))\r
+ )\r
+ {\r
//\r
// Full length of address shall not have compressing zeros.\r
// Non-full length of address shall have compressing zeros.\r
//\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);\r
ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);\r
if (AddressIndex > CompressStart) {\r
&LocalAddress.Addr[CompressStart],\r
AddressIndex - CompressStart\r
);\r
-\r
}\r
\r
if (PrefixLength != NULL) {\r
*PrefixLength = LocalPrefixLength;\r
}\r
+\r
if (EndPointer != NULL) {\r
- *EndPointer = (CHAR8 *) Pointer;\r
+ *EndPointer = (CHAR8 *)Pointer;\r
}\r
\r
return RETURN_SUCCESS;\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrToIpv4Address (\r
- IN CONST CHAR8 *String,\r
- OUT CHAR8 **EndPointer OPTIONAL,\r
- OUT IPv4_ADDRESS *Address,\r
- OUT UINT8 *PrefixLength OPTIONAL\r
+ IN CONST CHAR8 *String,\r
+ OUT CHAR8 **EndPointer OPTIONAL,\r
+ OUT IPv4_ADDRESS *Address,\r
+ OUT UINT8 *PrefixLength OPTIONAL\r
)\r
{\r
- RETURN_STATUS Status;\r
- UINTN AddressIndex;\r
- UINTN Uintn;\r
- IPv4_ADDRESS LocalAddress;\r
- UINT8 LocalPrefixLength;\r
- CHAR8 *Pointer;\r
+ RETURN_STATUS Status;\r
+ UINTN AddressIndex;\r
+ UINTN Uintn;\r
+ IPv4_ADDRESS LocalAddress;\r
+ UINT8 LocalPrefixLength;\r
+ CHAR8 *Pointer;\r
\r
LocalPrefixLength = MAX_UINT8;\r
\r
SAFE_STRING_CONSTRAINT_CHECK ((String != NULL), RETURN_INVALID_PARAMETER);\r
SAFE_STRING_CONSTRAINT_CHECK ((Address != NULL), RETURN_INVALID_PARAMETER);\r
\r
- for (Pointer = (CHAR8 *) String, AddressIndex = 0; AddressIndex < ARRAY_SIZE (Address->Addr) + 1;) {\r
+ for (Pointer = (CHAR8 *)String, AddressIndex = 0; AddressIndex < ARRAY_SIZE (Address->Addr) + 1;) {\r
if (!InternalAsciiIsDecimalDigitCharacter (*Pointer)) {\r
//\r
// D or P contains invalid characters.\r
//\r
// Get D or P.\r
//\r
- Status = AsciiStrDecimalToUintnS ((CONST CHAR8 *) Pointer, &Pointer, &Uintn);\r
+ Status = AsciiStrDecimalToUintnS ((CONST CHAR8 *)Pointer, &Pointer, &Uintn);\r
if (RETURN_ERROR (Status)) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
if (AddressIndex == ARRAY_SIZE (Address->Addr)) {\r
//\r
// It's P.\r
if (Uintn > 32) {\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalPrefixLength = (UINT8) Uintn;\r
+\r
+ LocalPrefixLength = (UINT8)Uintn;\r
} else {\r
//\r
// It's D.\r
if (Uintn > MAX_UINT8) {\r
return RETURN_UNSUPPORTED;\r
}\r
- LocalAddress.Addr[AddressIndex] = (UINT8) Uintn;\r
+\r
+ LocalAddress.Addr[AddressIndex] = (UINT8)Uintn;\r
AddressIndex++;\r
}\r
\r
if (PrefixLength != NULL) {\r
*PrefixLength = LocalPrefixLength;\r
}\r
+\r
if (EndPointer != NULL) {\r
*EndPointer = Pointer;\r
}\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrToGuid (\r
- IN CONST CHAR8 *String,\r
- OUT GUID *Guid\r
+ IN CONST CHAR8 *String,\r
+ OUT GUID *Guid\r
)\r
{\r
- RETURN_STATUS Status;\r
- GUID LocalGuid;\r
+ RETURN_STATUS Status;\r
+ GUID LocalGuid;\r
\r
//\r
// None of String or Guid shall be a null pointer.\r
//\r
// Get aabbccdd in big-endian.\r
//\r
- Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data1), (UINT8 *) &LocalGuid.Data1, sizeof (LocalGuid.Data1));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data1)] != '-') {\r
+ Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data1), (UINT8 *)&LocalGuid.Data1, sizeof (LocalGuid.Data1));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data1)] != '-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data1 = SwapBytes32 (LocalGuid.Data1);\r
- String += 2 * sizeof (LocalGuid.Data1) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data1) + 1;\r
\r
//\r
// Get eeff in big-endian.\r
//\r
- Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data2), (UINT8 *) &LocalGuid.Data2, sizeof (LocalGuid.Data2));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data2)] != '-') {\r
+ Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data2), (UINT8 *)&LocalGuid.Data2, sizeof (LocalGuid.Data2));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data2)] != '-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data2 = SwapBytes16 (LocalGuid.Data2);\r
- String += 2 * sizeof (LocalGuid.Data2) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data2) + 1;\r
\r
//\r
// Get gghh in big-endian.\r
//\r
- Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data3), (UINT8 *) &LocalGuid.Data3, sizeof (LocalGuid.Data3));\r
- if (RETURN_ERROR (Status) || String[2 * sizeof (LocalGuid.Data3)] != '-') {\r
+ Status = AsciiStrHexToBytes (String, 2 * sizeof (LocalGuid.Data3), (UINT8 *)&LocalGuid.Data3, sizeof (LocalGuid.Data3));\r
+ if (RETURN_ERROR (Status) || (String[2 * sizeof (LocalGuid.Data3)] != '-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
//\r
// Convert big-endian to little-endian.\r
//\r
LocalGuid.Data3 = SwapBytes16 (LocalGuid.Data3);\r
- String += 2 * sizeof (LocalGuid.Data3) + 1;\r
+ String += 2 * sizeof (LocalGuid.Data3) + 1;\r
\r
//\r
// Get iijj.\r
//\r
Status = AsciiStrHexToBytes (String, 2 * 2, &LocalGuid.Data4[0], 2);\r
- if (RETURN_ERROR (Status) || String[2 * 2] != '-') {\r
+ if (RETURN_ERROR (Status) || (String[2 * 2] != '-')) {\r
return RETURN_UNSUPPORTED;\r
}\r
+\r
String += 2 * 2 + 1;\r
\r
//\r
RETURN_STATUS\r
EFIAPI\r
AsciiStrHexToBytes (\r
- IN CONST CHAR8 *String,\r
- IN UINTN Length,\r
- OUT UINT8 *Buffer,\r
- IN UINTN MaxBufferSize\r
+ IN CONST CHAR8 *String,\r
+ IN UINTN Length,\r
+ OUT UINT8 *Buffer,\r
+ IN UINTN MaxBufferSize\r
)\r
{\r
- UINTN Index;\r
+ UINTN Index;\r
\r
//\r
// 1. None of String or Buffer shall be a null pointer.\r
break;\r
}\r
}\r
+\r
if (Index != Length) {\r
return RETURN_UNSUPPORTED;\r
}\r
//\r
// Convert the hex string to bytes.\r
//\r
- for(Index = 0; Index < Length; Index++) {\r
-\r
+ for (Index = 0; Index < Length; Index++) {\r
//\r
// For even characters, write the upper nibble for each buffer byte,\r
// and for even characters, the lower nibble.\r
//\r
if ((Index & BIT0) == 0) {\r
- Buffer[Index / 2] = (UINT8) InternalAsciiHexCharToUintn (String[Index]) << 4;\r
+ Buffer[Index / 2] = (UINT8)InternalAsciiHexCharToUintn (String[Index]) << 4;\r
} else {\r
- Buffer[Index / 2] |= (UINT8) InternalAsciiHexCharToUintn (String[Index]);\r
+ Buffer[Index / 2] |= (UINT8)InternalAsciiHexCharToUintn (String[Index]);\r
}\r
}\r
+\r
return RETURN_SUCCESS;\r
}\r
projects / mirror_edk2.git / blobdiff