tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Ruiyu Ni 2017-02-21 17:58:45 +08:00
parent 2a08577480
commit 58974b6e07
1 changed files with 3 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
View File

@ -861,144 +861,6 @@ UpdateGetProfileString (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
Converts a list of string to a specified buffer.
@param[out] Buf The output buffer that contains the string.
@param[in] BufferLength The length of the buffer
@param[in] Str The input string that contains the hex number
@retval EFI_SUCCESS The string was successfully converted to the buffer.
**/
EFI_STATUS
AsciiStrToBuf (
OUT UINT8 *Buf,
IN UINTN BufferLength,
IN CHAR8 *Str
)
{
UINTN Index;
UINTN StrLength;
UINT8 Digit;
UINT8 Byte;
Digit = 0;
//
// Two hex char make up one byte
//
StrLength = BufferLength * 2;
for(Index = 0; Index < StrLength; Index++, Str++) {
if ((*Str >= 'a') && (*Str <= 'f')) {
Digit = (UINT8) (*Str - 'a' + 0x0A);
} else if ((*Str >= 'A') && (*Str <= 'F')) {
Digit = (UINT8) (*Str - 'A' + 0x0A);
} else if ((*Str >= '0') && (*Str <= '9')) {
Digit = (UINT8) (*Str - '0');
} else {
return EFI_INVALID_PARAMETER;
}
//
// For odd characters, write the upper nibble for each buffer byte,
// and for even characters, the lower nibble.
//
if ((Index & 1) == 0) {
Byte = (UINT8) (Digit << 4);
} else {
Byte = Buf[Index / 2];
Byte &= 0xF0;
Byte = (UINT8) (Byte | Digit);
}
Buf[Index / 2] = Byte;
}
return EFI_SUCCESS;
}
/**
Converts a string to GUID value.
Guid Format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
@param[in] Str The registry format GUID string that contains the GUID value.
@param[out] Guid A pointer to the converted GUID value.
@retval EFI_SUCCESS The GUID string was successfully converted to the GUID value.
@retval EFI_UNSUPPORTED The input string is not in registry format.
@return others Some error occurred when converting part of GUID value.
**/
EFI_STATUS
IniAsciiStrToGuid (
IN CHAR8 *Str,
OUT EFI_GUID *Guid
)
{
//
// Get the first UINT32 data
//
Guid->Data1 = (UINT32) AsciiStrHexToUint64 (Str);
while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
Str ++;
}
if (IS_HYPHEN (*Str)) {
Str++;
} else {
return EFI_UNSUPPORTED;
}
//
// Get the second UINT16 data
//
Guid->Data2 = (UINT16) AsciiStrHexToUint64 (Str);
while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
Str ++;
}
if (IS_HYPHEN (*Str)) {
Str++;
} else {
return EFI_UNSUPPORTED;
}
//
// Get the third UINT16 data
//
Guid->Data3 = (UINT16) AsciiStrHexToUint64 (Str);
while (!IS_HYPHEN (*Str) && !IS_NULL (*Str)) {
Str ++;
}
if (IS_HYPHEN (*Str)) {
Str++;
} else {
return EFI_UNSUPPORTED;
}
//
// Get the following 8 bytes data
//
AsciiStrToBuf (&Guid->Data4[0], 2, Str);
//
// Skip 2 byte hex chars
//
Str += 2 * 2;
if (IS_HYPHEN (*Str)) {
Str++;
} else {
return EFI_UNSUPPORTED;
}
AsciiStrToBuf (&Guid->Data4[2], 6, Str);
return EFI_SUCCESS;
}
/** /**
Pre process config data buffer into Section entry list and Comment entry list. Pre process config data buffer into Section entry list and Comment entry list.
@ -1243,6 +1105,7 @@ GetGuidFromDataFile (
{ {
CHAR8 *Value; CHAR8 *Value;
EFI_STATUS Status; EFI_STATUS Status;
RETURN_STATUS RStatus;
if (Context == NULL || SectionName == NULL || EntryName == NULL || Guid == NULL) { if (Context == NULL || SectionName == NULL || EntryName == NULL || Guid == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -1258,11 +1121,8 @@ GetGuidFromDataFile (
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
ASSERT (Value != NULL); ASSERT (Value != NULL);
if (!IsValidGuid(Value, AsciiStrLen(Value))) { RStatus = AsciiStrToGuid (Value, Guid);
return EFI_NOT_FOUND; if (RETURN_ERROR (RStatus) || (Value[GUID_STRING_LENGTH] != '\0')) {
}
Status = IniAsciiStrToGuid(Value, Guid);
if (EFI_ERROR (Status)) {
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
return EFI_SUCCESS; return EFI_SUCCESS;