From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 C0E4F8222F for ; Tue, 21 Feb 2017 21:28:24 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 21:28:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,192,1484035200"; d="scan'208,217";a="67588147" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 21 Feb 2017 21:28:23 -0800 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 21 Feb 2017 21:28:23 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 21 Feb 2017 21:28:23 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX103.ccr.corp.intel.com ([10.239.4.69]) with mapi id 14.03.0248.002; Wed, 22 Feb 2017 13:28:21 +0800 From: "Yao, Jiewen" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib Thread-Index: AQHSjMdKSb0whx/oOUGwQYdlBDN4xKF0fs6w Date: Wed, 22 Feb 2017 05:28:20 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A8F3327@shsmsx102.ccr.corp.intel.com> References: <20170222045047.558308-1-ruiyu.ni@intel.com> <20170222045047.558308-11-ruiyu.ni@intel.com> In-Reply-To: <20170222045047.558308-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 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [PATCH 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: Wed, 22 Feb 2017 05:28:25 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi I do not suggest we use below check. if (RETURN_ERROR (AsciiStrToGuid (Value, Guid))) { I suggest we use below style, because it may help source level debug to see= what Status is returned. Status =3D AsciiStrToGuid (Value, Guid); if (EFI_ERROR (Status)) { The suggestion is applied to all patches, such as CapsuleApp Thank you Yao Jiewen > -----Original Message----- > From: Ni, Ruiyu > Sent: Wednesday, February 22, 2017 12:51 PM > To: edk2-devel@lists.01.org > Cc: Yao, Jiewen > Subject: [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid= in > BaseLib > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Jiewen Yao > --- > .../Library/IniParsingLib/IniParsingLib.c | 141 +--------------= ------ > 1 file changed, 1 insertion(+), 140 deletions(-) > > diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > index 16e1349..e9c2cc5 100644 > --- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > +++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c > @@ -862,144 +862,6 @@ UpdateGetProfileString ( > } > > /** > - 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. > > @param[in] DataBuffer Config raw file buffer. > @@ -1261,8 +1123,7 @@ GetGuidFromDataFile ( > if (!IsValidGuid(Value, AsciiStrLen(Value))) { > return EFI_NOT_FOUND; > } > - Status =3D IniAsciiStrToGuid(Value, Guid); > - if (EFI_ERROR (Status)) { > + if (RETURN_ERROR (AsciiStrToGuid (Value, Guid))) { > return EFI_NOT_FOUND; > } > return EFI_SUCCESS; > -- > 2.9.0.windows.1