Clean up the private GUID definition in module Level.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / UefiShellDebug1CommandsLib.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 226dd903971a794e43309e80ddfeb352ddd1b68f..9ab5d89748a82bd62aea26a355fa8fc2b40f39cd 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -16,10 +16,6 @@
 \r
 STATIC CONST CHAR16 mFileName[] = L"Debug1Commands";\r
 EFI_HANDLE gShellDebug1HiiHandle = NULL;\r
-CONST EFI_GUID gShellDebug1HiiGuid = \\r
-  { \\r
-    0x25f200aa, 0xd3cb, 0x470a, { 0xbf, 0x51, 0xe7, 0xd1, 0x62, 0xd2, 0x2e, 0x6f } \\r
-  };\r
 \r
 /**\r
   Gets the debug file name.  This will be used if HII is not working.\r
@@ -56,7 +52,7 @@ UefiShellDebug1CommandsLibConstructor (
   // check our bit of the profiles mask\r
   //\r
   if ((PcdGet8(PcdShellProfileMask) & BIT1) == 0) {\r
-    return (EFI_UNSUPPORTED);\r
+    return (EFI_SUCCESS);\r
   }\r
 \r
   //\r
@@ -150,7 +146,6 @@ STATIC CONST CHAR8 Hex[] = {
   @param[in] UserData   The data to print out.\r
 **/\r
 VOID\r
-EFIAPI\r
 DumpHex (\r
   IN UINTN        Indent,\r
   IN UINTN        Offset,\r
@@ -227,8 +222,8 @@ CharToUpper (
   Function returns a system configuration table that is stored in the\r
   EFI System Table based on the provided GUID.\r
 \r
-  @param[in]  TableGuid    A pointer to the table's GUID type.\r
-  @param[in,out] Table     On exit, a pointer to a system configuration table.\r
+  @param[in]  TableGuid     A pointer to the table's GUID type.\r
+  @param[in, out] Table     On exit, a pointer to a system configuration table.\r
 \r
   @retval EFI_SUCCESS      A configuration table matching TableGuid was found.\r
   @retval EFI_NOT_FOUND    A configuration table matching TableGuid was not found.\r
@@ -282,8 +277,8 @@ HexCharToUintn (
 /**\r
   Convert a string representation of a guid to a Guid value.\r
 \r
-  @param[in] StringGuid   The pointer to the string of a guid.\r
-  @param[in,out] Guid     The pointer to the GUID structure to populate.\r
+  @param[in] StringGuid    The pointer to the string of a guid.\r
+  @param[in, out] Guid     The pointer to the GUID structure to populate.\r
 \r
   @retval EFI_INVALID_PARAMETER   A parameter was invalid.\r
   @retval EFI_SUCCESS             The conversion was successful.\r
@@ -310,7 +305,9 @@ ConvertStringToGuid (
   TempCopy = StrnCatGrow(&TempCopy, NULL, StringGuid, 0);\r
   Walker   = TempCopy;\r
   TempSpot = StrStr(Walker, L"-");\r
-  *TempSpot = CHAR_NULL;\r
+  if (TempSpot != NULL) {\r
+    *TempSpot = CHAR_NULL;\r
+  }\r
   Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);\r
   if (EFI_ERROR(Status)) {\r
     FreePool(TempCopy);\r
@@ -319,7 +316,9 @@ ConvertStringToGuid (
   Guid->Data1 = (UINT32)TempVal;\r
   Walker += 9;\r
   TempSpot = StrStr(Walker, L"-");\r
-  *TempSpot = CHAR_NULL;\r
+  if (TempSpot != NULL) {\r
+    *TempSpot = CHAR_NULL;\r
+  }\r
   Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);\r
   if (EFI_ERROR(Status)) {\r
     FreePool(TempCopy);\r
@@ -328,7 +327,9 @@ ConvertStringToGuid (
   Guid->Data2 = (UINT16)TempVal;\r
   Walker += 5;\r
   TempSpot = StrStr(Walker, L"-");\r
-  *TempSpot = CHAR_NULL;\r
+  if (TempSpot != NULL) {\r
+    *TempSpot = CHAR_NULL;\r
+  }\r
   Status = ShellConvertStringToUint64(Walker, &TempVal, TRUE, FALSE);\r
   if (EFI_ERROR(Status)) {\r
     FreePool(TempCopy);\r
@@ -363,52 +364,6 @@ ConvertStringToGuid (
   return (EFI_SUCCESS);\r
 }\r
 \r
-CHAR16  TempBufferCatSPrint[1000];\r
-/** \r
-  Appends a formatted Unicode string to a Null-terminated Unicode string\r
- \r
-  This function appends a formatted Unicode string to the Null-terminated \r
-  Unicode string specified by String.   String is optional and may be NULL.\r
-  Storage for the formatted Unicode string returned is allocated using \r
-  AllocateZeroPool().  The pointer to the appended string is returned.  The caller\r
-  is responsible for freeing the returned string.\r
- \r
-  If String is not NULL and not aligned on a 16-bit boundary, then ASSERT().\r
-  If Format is NULL, then ASSERT().\r
-  If Format is not aligned on a 16-bit boundary, then ASSERT().\r
- \r
-  @param String   A null-terminated Unicode string.\r
-  @param FormatString  A null-terminated Unicode format string.\r
-  @param ...      The variable argument list whose contents are accessed based \r
-                  on the format string specified by Format.\r
-\r
-  @retval NULL    There was not enough available memory.\r
-  @return         Null terminated Unicode string is that is the formatted \r
-                  string appended to String.\r
-  @sa CatVSPrint\r
-**/\r
-CHAR16*\r
-EFIAPI\r
-CatSPrint (\r
-  IN  CONST CHAR16  *String OPTIONAL,\r
-  IN  CONST CHAR16  *FormatString,\r
-  ...\r
-  )\r
-{\r
-  VA_LIST Marker;\r
-  UINTN   StringLength;\r
-  if (String != NULL) {\r
-    StrCpy(TempBufferCatSPrint, String);\r
-  } else {\r
-    *TempBufferCatSPrint = CHAR_NULL;\r
-  }\r
-  VA_START (Marker, FormatString);\r
-  StringLength = StrLen(TempBufferCatSPrint);\r
-\r
-  UnicodeVSPrint(TempBufferCatSPrint+StrLen(TempBufferCatSPrint), 1000-StringLength, FormatString, Marker);\r
-  return (AllocateCopyPool(StrSize(TempBufferCatSPrint), TempBufferCatSPrint));\r
-}\r
-\r
 /**\r
   Clear the line at the specified Row.\r
   \r