ShellPkg/Debug1CommandLib: Use StrToGuid/StrHexToBytes in BaseLib

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

4 files changed, 11 insertions, 159 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index bb2c0b98ec..701ff7505f 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 d98a3469a3..c59032a811 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/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 6ebf0024c6..8e2141bf43 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.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/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index 52ea56aebb..80a8476a5e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.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).