public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ni, Ruiyu" <ruiyu.ni@intel.com>
To: "Yao, Jiewen" <jiewen.yao@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib
Date: Wed, 22 Feb 2017 07:40:28 +0000	[thread overview]
Message-ID: <734D49CCEBEEF84792F5B80ED585239D5B8AB238@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <74D8A39837DF1E4DA445A8C0B3885C503A8F3327@shsmsx102.ccr.corp.intel.com>

Can we use EFI_STATUS variable to receive RETURN_STATUS type of value?

Thanks/Ray

From: Yao, Jiewen
Sent: Wednesday, February 22, 2017 1:28 PM
To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
Subject: RE: [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in BaseLib

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 = 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<mailto:edk2-devel@lists.01.org>
> Cc: Yao, Jiewen <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>
> Subject: [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid in
> BaseLib
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com<mailto:ruiyu.ni@intel.com>>
> Cc: Jiewen Yao <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>
> ---
>  .../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 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.
>
>    @param[in]      DataBuffer      Config raw file buffer.
> @@ -1261,8 +1123,7 @@ GetGuidFromDataFile (
>    if (!IsValidGuid(Value, AsciiStrLen(Value))) {
>      return EFI_NOT_FOUND;
>    }
> -  Status = 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


  reply	other threads:[~2017-02-22  7:40 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-22  4:50 [PATCH 00/11] Add StrToGuid/HexToBytes/Ipv4/Ipv6 in BaseLib Ruiyu Ni
2017-02-22  4:50 ` [PATCH 01/11] MdePkg: Define IPv4_ADDRESS and IPv6_ADDRESS in Base.h Ruiyu Ni
2017-02-22  4:50 ` [PATCH 02/11] MdePkg/UefiDevicePathLib: Rename StrToGuid to avoid link failure Ruiyu Ni
2017-02-22  4:50 ` [PATCH 03/11] SignedCapsulePkg/IniParsing: " Ruiyu Ni
2017-02-22  4:50 ` [PATCH 04/11] MdePkg/BaseLib: Add StrToGuid/StrHexToBytes/StrToIpv[4/6]Address Ruiyu Ni
2017-02-22  6:02   ` Yao, Jiewen
2017-02-22  7:58     ` Ni, Ruiyu
2017-02-22  8:14       ` Yao, Jiewen
2017-02-22  4:50 ` [PATCH 05/11] MdePkg/BaseLib: Add AsciiStrToGuid/HexToBytes/ToIpv[4/6]Address Ruiyu Ni
2017-02-22  4:50 ` [PATCH 06/11] MdePkg/UefiDevicePathLib: Use BaseLib string conversion services Ruiyu Ni
2017-02-22  4:50 ` [PATCH 07/11] MdeModulePkg/CapsuleApp: Use StrToGuid in BaseLib Ruiyu Ni
2017-02-22  4:50 ` [PATCH 08/11] SecurityPkg/SecureBootConfigDxe: " Ruiyu Ni
2017-02-22  4:50 ` [PATCH 09/11] ShellPkg/Debug1CommandLib: Use StrToGuid/StrHexToBytes " Ruiyu Ni
2017-02-22  4:50 ` [PATCH 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid " Ruiyu Ni
2017-02-22  5:28   ` Yao, Jiewen
2017-02-22  7:40     ` Ni, Ruiyu [this message]
2017-02-22  4:50 ` [PATCH 11/11] MdeModulePkg/NetLib: Use StrToIpv4/6Address " Ruiyu Ni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=734D49CCEBEEF84792F5B80ED585239D5B8AB238@SHSMSX104.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox