From: "Carsey, Jaben" <jaben.carsey@intel.com>
To: "Ni, Ruiyu" <ruiyu.ni@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Carsey, Jaben" <jaben.carsey@intel.com>
Subject: Re: [PATCH v2 09/11] ShellPkg/Debug1CommandLib: Use StrToGuid/StrHexToBytes in BaseLib
Date: Tue, 28 Feb 2017 17:05:05 +0000 [thread overview]
Message-ID: <CB6E33457884FA40993F35157061515C54B8BFB8@FMSMSX103.amr.corp.intel.com> (raw)
In-Reply-To: <20170227072239.273228-10-ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, February 26, 2017 11:23 PM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH v2 09/11] ShellPkg/Debug1CommandLib: Use
> StrToGuid/StrHexToBytes in BaseLib
> Importance: High
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
> .../Library/UefiShellDebug1CommandsLib/DmpStore.c | 7 +-
> .../Library/UefiShellDebug1CommandsLib/SetVar.c | 12 +--
> .../UefiShellDebug1CommandsLib.c | 119 +--------------------
> .../UefiShellDebug1CommandsLib.h | 32 +-----
> 4 files changed, 11 insertions(+), 159 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> index bb2c0b9..701ff75 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
> @@ -2,7 +2,7 @@
> Main file for DmpStore shell Debug1 function.
>
> (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
> - Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -676,6 +676,7 @@ ShellCommandRunDmpStore (
> )
> {
> EFI_STATUS Status;
> + RETURN_STATUS RStatus;
> LIST_ENTRY *Package;
> CHAR16 *ProblemParam;
> SHELL_STATUS ShellStatus;
> @@ -728,8 +729,8 @@ ShellCommandRunDmpStore (
> if (!ShellCommandLineGetFlag(Package, L"-all")) {
> GuidStr = ShellCommandLineGetValue(Package, L"-guid");
> if (GuidStr != NULL) {
> - Status = ConvertStringToGuid(GuidStr, &GuidData);
> - if (EFI_ERROR(Status)) {
> + RStatus = StrToGuid (GuidStr, &GuidData);
> + if (RETURN_ERROR (RStatus) || (GuidStr[GUID_STRING_LENGTH] !=
> L'\0')) {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV),
> gShellDebug1HiiHandle, L"dmpstore", GuidStr);
> ShellStatus = SHELL_INVALID_PARAMETER;
> }
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
> index d98a346..c59032a 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SetVar.c
> @@ -2,7 +2,7 @@
> Main file for SetVar shell Debug1 function.
>
> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
> - Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -65,6 +65,7 @@ ShellCommandRunSetVar (
> )
> {
> EFI_STATUS Status;
> + RETURN_STATUS RStatus;
> LIST_ENTRY *Package;
> CHAR16 *ProblemParam;
> SHELL_STATUS ShellStatus;
> @@ -120,8 +121,8 @@ ShellCommandRunSetVar (
> CopyGuid(&Guid, &gEfiGlobalVariableGuid);
> } else {
> StringGuid = ShellCommandLineGetValue(Package, L"-guid");
> - Status = ConvertStringToGuid(StringGuid, &Guid);
> - if (EFI_ERROR(Status)) {
> + RStatus = StrToGuid (StringGuid, &Guid);
> + if (RETURN_ERROR (RStatus) || (StringGuid[GUID_STRING_LENGTH] !=
> L'\0')) {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV),
> gShellDebug1HiiHandle, L"setvar", StringGuid);
> ShellStatus = SHELL_INVALID_PARAMETER;
> }
> @@ -207,10 +208,7 @@ ShellCommandRunSetVar (
> if (Buffer == NULL) {
> Status = EFI_OUT_OF_RESOURCES;
> } else {
> - for (LoopVar = 0 ; LoopVar < (StrLen(Data) / 2) ; LoopVar++) {
> - ((UINT8*)Buffer)[LoopVar] =
> (UINT8)(HexCharToUintn(Data[LoopVar*2]) * 16);
> - ((UINT8*)Buffer)[LoopVar] = (UINT8)(((UINT8*)Buffer)[LoopVar] +
> HexCharToUintn(Data[LoopVar*2+1]));
> - }
> + StrHexToBytes (Data, StrLen (Data), Buffer, StrLen (Data) / 2);
> Status = gRT->SetVariable((CHAR16*)VariableName, &Guid,
> Attributes, StrLen(Data) / 2, Buffer);
> }
> if (EFI_ERROR(Status)) {
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> index 6ebf002..8e2141b 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.c
> @@ -1,7 +1,7 @@
> /** @file
> Main file for NULL named library for debug1 profile shell command
> functions.
>
> - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -172,123 +172,6 @@ GetSystemConfigurationTable (
> }
>
> /**
> - Convert a Unicode character to numerical value.
> -
> - This internal function only deal with Unicode character
> - which maps to a valid hexadecimal ASII character, i.e.
> - L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other
> - Unicode character, the value returned does not make sense.
> -
> - @param Char The character to convert.
> -
> - @return The numerical value converted.
> -
> -**/
> -UINTN
> -HexCharToUintn (
> - IN CHAR16 Char
> - )
> -{
> - if (Char >= L'0' && Char <= L'9') {
> - return Char - L'0';
> - }
> -
> - return (UINTN) (10 + CharToUpper (Char) - L'A');
> -}
> -
> -/**
> - Convert a string representation of a guid to a Guid value.
> -
> - @param[in] StringGuid The pointer to the string of a guid.
> - @param[in, out] Guid The pointer to the GUID structure to populate.
> -
> - @retval EFI_INVALID_PARAMETER A parameter was invalid.
> - @retval EFI_SUCCESS The conversion was successful.
> -**/
> -EFI_STATUS
> -ConvertStringToGuid (
> - IN CONST CHAR16 *StringGuid,
> - IN OUT EFI_GUID *Guid
> - )
> -{
> - CHAR16 *TempCopy;
> - CHAR16 *TempSpot;
> - CHAR16 *Walker;
> - UINT64 TempVal;
> - EFI_STATUS Status;
> -
> - if (StringGuid == NULL) {
> - return (EFI_INVALID_PARAMETER);
> - } else if (StrLen(StringGuid) != 36) {
> - return (EFI_INVALID_PARAMETER);
> - }
> - TempCopy = NULL;
> - TempCopy = StrnCatGrow(&TempCopy, NULL, StringGuid, 0);
> - if (TempCopy == NULL) {
> - return (EFI_OUT_OF_RESOURCES);
> - }
> - Walker = TempCopy;
> - TempSpot = StrStr(Walker, L"-");
> - if (TempSpot != NULL) {
> - *TempSpot = CHAR_NULL;
> - }
> - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);
> - if (EFI_ERROR(Status)) {
> - FreePool(TempCopy);
> - return (Status);
> - }
> - Guid->Data1 = (UINT32)TempVal;
> - Walker += 9;
> - TempSpot = StrStr(Walker, L"-");
> - if (TempSpot != NULL) {
> - *TempSpot = CHAR_NULL;
> - }
> - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);
> - if (EFI_ERROR(Status)) {
> - FreePool(TempCopy);
> - return (Status);
> - }
> - Guid->Data2 = (UINT16)TempVal;
> - Walker += 5;
> - TempSpot = StrStr(Walker, L"-");
> - if (TempSpot != NULL) {
> - *TempSpot = CHAR_NULL;
> - }
> - Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);
> - if (EFI_ERROR(Status)) {
> - FreePool(TempCopy);
> - return (Status);
> - }
> - Guid->Data3 = (UINT16)TempVal;
> - Walker += 5;
> - Guid->Data4[0] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[0] = (UINT8)(Guid->Data4[0]+
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[1] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[1] = (UINT8)(Guid->Data4[1] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 3;
> - Guid->Data4[2] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[2] = (UINT8)(Guid->Data4[2] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[3] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[3] = (UINT8)(Guid->Data4[3] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[4] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[4] = (UINT8)(Guid->Data4[4] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[5] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[5] = (UINT8)(Guid->Data4[5] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[6] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[6] = (UINT8)(Guid->Data4[6] +
> (UINT8)HexCharToUintn(Walker[1]));
> - Walker += 2;
> - Guid->Data4[7] = (UINT8)(HexCharToUintn(Walker[0]) * 16);
> - Guid->Data4[7] = (UINT8)(Guid->Data4[7] +
> (UINT8)HexCharToUintn(Walker[1]));
> - FreePool(TempCopy);
> - return (EFI_SUCCESS);
> -}
> -
> -/**
> Clear the line at the specified Row.
>
> @param[in] Row The row number to be cleared ( start from 1 )
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.h
> index 52ea56a..80a8476 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.h
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman
> dsLib.h
> @@ -1,7 +1,7 @@
> /** @file
> Main file for NULL named library for Profile1 shell command functions.
>
> - Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> found at
> @@ -77,36 +77,6 @@ GetSystemConfigurationTable (
> );
>
> /**
> - Convert a string representation of a GUID to the GUID value.
> -
> - @param[in] StringGuid The pointer to the string containing a GUID
> printed.
> - @param[in, out] Guid The pointer to the buffer to get the GUID value.
> -**/
> -EFI_STATUS
> -ConvertStringToGuid (
> - IN CONST CHAR16 *StringGuid,
> - IN OUT EFI_GUID *Guid
> - );
> -
> -/**
> - Convert a Unicode character to numerical value.
> -
> - This internal function only deal with Unicode character
> - which maps to a valid hexadecimal ASII character, i.e.
> - L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other
> - Unicode character, the value returned does not make sense.
> -
> - @param Char The character to convert.
> -
> - @return The numerical value converted.
> -
> -**/
> -UINTN
> -HexCharToUintn (
> - IN CHAR16 Char
> - );
> -
> -/**
> Function for 'setsize' command.
>
> @param[in] ImageHandle Handle to the Image (NULL if Internal).
> --
> 2.9.0.windows.1
next prev parent reply other threads:[~2017-02-28 17:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 7:22 [PATCH v2 00/11] Add StrToGuid/HexToBytes/Ipv4/Ipv6 in BaseLib Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 01/11] MdePkg: Define IPv4_ADDRESS and IPv6_ADDRESS in Base.h Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 02/11] MdePkg/UefiDevicePathLib: Rename StrToGuid to avoid link failure Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 03/11] SignedCapsulePkg/IniParsing: " Ruiyu Ni
2017-02-27 7:51 ` Yao, Jiewen
2017-02-27 7:22 ` [PATCH v2 04/11] MdePkg/BaseLib: Add StrToGuid/StrHexToBytes/StrToIpv[4/6]Address Ruiyu Ni
2017-02-28 5:23 ` Fu, Siyuan
2017-02-27 7:22 ` [PATCH v2 05/11] MdePkg/BaseLib: Add AsciiStrToGuid/HexToBytes/ToIpv[4/6]Address Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 06/11] MdePkg/UefiDevicePathLib: Use BaseLib string conversion services Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 07/11] MdeModulePkg/CapsuleApp: Use StrToGuid in BaseLib Ruiyu Ni
2017-02-27 7:50 ` Yao, Jiewen
2017-02-27 7:22 ` [PATCH v2 08/11] SecurityPkg/SecureBootConfigDxe: " Ruiyu Ni
2017-02-27 7:22 ` [PATCH v2 09/11] ShellPkg/Debug1CommandLib: Use StrToGuid/StrHexToBytes " Ruiyu Ni
2017-02-28 17:05 ` Carsey, Jaben [this message]
2017-02-27 7:22 ` [PATCH v2 10/11] SignedCapsulePkg/IniParsingLib: Use AsciiStrToGuid " Ruiyu Ni
2017-02-27 7:50 ` Yao, Jiewen
2017-02-27 7:22 ` [PATCH v2 11/11] MdeModulePkg/NetLib: Use StrToIpv4/6Address " Ruiyu Ni
2017-02-28 3:23 ` [PATCH v2 00/11] Add StrToGuid/HexToBytes/Ipv4/Ipv6 " Gao, Liming
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=CB6E33457884FA40993F35157061515C54B8BFB8@FMSMSX103.amr.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