From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7CFEF81F5C for ; Sun, 26 Feb 2017 23:51:55 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 26 Feb 2017 23:51:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,213,1484035200"; d="scan'208";a="1115988989" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga001.fm.intel.com with ESMTP; 26 Feb 2017 23:51:51 -0800 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 26 Feb 2017 23:51:43 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 26 Feb 2017 23:51:42 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.204]) with mapi id 14.03.0248.002; Mon, 27 Feb 2017 15:50:22 +0800 From: "Yao, Jiewen" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH v2 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib Thread-Index: AQHSkMpS+aoQLzrQFkCAvdrrN2RBg6F8eqmg Date: Mon, 27 Feb 2017 07:50:22 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A8F5CC6@shsmsx102.ccr.corp.intel.com> References: <20170227072239.273228-1-ruiyu.ni@intel.com> <20170227072239.273228-11-ruiyu.ni@intel.com> In-Reply-To: <20170227072239.273228-11-ruiyu.ni@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2017 07:51:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: jiewen.yao@intel.com > -----Original Message----- > From: Ni, Ruiyu > Sent: Monday, February 27, 2017 3:23 PM > To: edk2-devel@lists.01.org > Cc: Yao, Jiewen > Subject: [PATCH v2 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToG= uid in > BaseLib >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Jiewen Yao > --- > .../Library/IniParsingLib/IniParsingLib.c | 146 +--------------= ------ > 1 file changed, 3 insertions(+), 143 deletions(-) >=20 > diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > index 16e1349..5763e04 100644 > --- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > +++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > @@ -862,144 +862,6 @@ UpdateGetProfileString ( > } >=20 > /** > - 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 num= ber > - > - @retval EFI_SUCCESS The string was successfully converted to the bu= ffer. > - > -**/ > -EFI_STATUS > -AsciiStrToBuf ( > - OUT UINT8 *Buf, > - IN UINTN BufferLength, > - IN CHAR8 *Str > - ) > -{ > - UINTN Index; > - UINTN StrLength; > - UINT8 Digit; > - UINT8 Byte; > - > - Digit =3D 0; > - > - // > - // Two hex char make up one byte > - // > - StrLength =3D BufferLength * 2; > - > - for(Index =3D 0; Index < StrLength; Index++, Str++) { > - > - if ((*Str >=3D 'a') && (*Str <=3D 'f')) { > - Digit =3D (UINT8) (*Str - 'a' + 0x0A); > - } else if ((*Str >=3D 'A') && (*Str <=3D 'F')) { > - Digit =3D (UINT8) (*Str - 'A' + 0x0A); > - } else if ((*Str >=3D '0') && (*Str <=3D '9')) { > - Digit =3D (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) =3D=3D 0) { > - Byte =3D (UINT8) (Digit << 4); > - } else { > - Byte =3D Buf[Index / 2]; > - Byte &=3D 0xF0; > - Byte =3D (UINT8) (Byte | Digit); > - } > - > - Buf[Index / 2] =3D 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 cont= ains > 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 =3D (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 =3D (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 =3D (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 +=3D 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 ent= ry list. >=20 > @param[in] DataBuffer Config raw file buffer. > @@ -1243,6 +1105,7 @@ GetGuidFromDataFile ( > { > CHAR8 *Value; > EFI_STATUS Status; > + RETURN_STATUS RStatus; >=20 > if (Context =3D=3D NULL || SectionName =3D=3D NULL || EntryName =3D=3D= NULL || Guid > =3D=3D NULL) { > return EFI_INVALID_PARAMETER; > @@ -1258,11 +1121,8 @@ GetGuidFromDataFile ( > return EFI_NOT_FOUND; > } > ASSERT (Value !=3D NULL); > - if (!IsValidGuid(Value, AsciiStrLen(Value))) { > - return EFI_NOT_FOUND; > - } > - Status =3D IniAsciiStrToGuid(Value, Guid); > - if (EFI_ERROR (Status)) { > + RStatus =3D AsciiStrToGuid (Value, Guid); > + if (RETURN_ERROR (RStatus) || (Value[GUID_STRING_LENGTH] !=3D '\0')) { > return EFI_NOT_FOUND; > } > return EFI_SUCCESS; > -- > 2.9.0.windows.1