ShellPkg/for: Fix potential null pointer deference

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

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
index d8755bfefce3919aeef982ad87a2dc113fbcd9f9..80a8476a5ef54cacdc6566185cfcef7ecfc1d150 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for NULL named library for Profile1 shell command functions.\r
 \r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,7 +16,6 @@
 #define _UEFI_SHELL_DEBUG1_COMMANDS_LIB_H_\r
 \r
 #include <Uefi.h>\r
-#include <ShellBase.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/ConsoleInDevice.h>\r
@@ -24,8 +23,8 @@
 #include <Guid/FileSystemInfo.h>\r
 #include <Guid/ShellLibHiiGuid.h>\r
 \r
-#include <Protocol/EfiShell.h>\r
-#include <Protocol/EfiShellParameters.h>\r
+#include <Protocol/Shell.h>\r
+#include <Protocol/ShellParameters.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/UnicodeCollation.h>\r
@@ -38,6 +37,7 @@
 #include <Protocol/DriverFamilyOverride.h>\r
 #include <Protocol/DriverHealth.h>\r
 #include <Protocol/SimplePointer.h>\r
+#include <Protocol/CpuIo2.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r
 \r
 #include <Library/BaseLib.h>\r
@@ -60,22 +60,6 @@
 \r
 extern        EFI_HANDLE                        gShellDebug1HiiHandle;\r
 \r
-/**\r
-  Function printing hex output to the console.\r
-\r
-  @param[in] Indent       Number of spaces to indent.\r
-  @param[in] Offset       Offset to start with.\r
-  @param[in] DataSize     Length of data.\r
-  @param[in] UserData     Pointer to some data.\r
-**/\r
-VOID\r
-DumpHex (\r
-  IN UINTN        Indent,\r
-  IN UINTN        Offset,\r
-  IN UINTN        DataSize,\r
-  IN VOID         *UserData\r
-  );\r
-\r
 /**\r
   Function returns a system configuration table that is stored in the\r
   EFI System Table based on the provided GUID.\r
@@ -87,44 +71,11 @@ DumpHex (
   @retval EFI_NOT_FOUND    A configuration table matching TableGuid was not found.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetSystemConfigurationTable (\r
   IN EFI_GUID *TableGuid,\r
   IN OUT VOID **Table\r
   );\r
 \r
-/**\r
-  Convert a string representation of a GUID to the GUID value.\r
-\r
-  @param[in]  StringGuid   The pointer to the string containing a GUID printed.\r
-  @param[in, out] Guid     The pointer to the buffer to get the GUID value.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ConvertStringToGuid (\r
-  IN CONST CHAR16 *StringGuid,\r
-  IN OUT EFI_GUID *Guid\r
-  );\r
-\r
-/**\r
-  Convert a Unicode character to numerical value.\r
-\r
-  This internal function only deal with Unicode character\r
-  which maps to a valid hexadecimal ASII character, i.e.\r
-  L'0' to L'9', L'a' to L'f' or L'A' to L'F'. For other\r
-  Unicode character, the value returned does not make sense.\r
-\r
-  @param  Char  The character to convert.\r
-\r
-  @return The numerical value converted.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-HexCharToUintn (\r
-  IN      CHAR16                    Char\r
-  );\r
-\r
 /**\r
   Function for 'setsize' command.\r
 \r
@@ -367,7 +318,6 @@ ShellCommandRunHexEdit (
   @param[in] LastRow            The last printable row.\r
 **/\r
 VOID\r
-EFIAPI\r
 EditorClearLine (\r
   IN UINTN Row,\r
   IN UINTN LastCol,\r
@@ -383,7 +333,6 @@ EditorClearLine (
   @retval FALSE     The filename is not ok.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidFileName (\r
   IN CONST CHAR16 *Name\r
   );\r
@@ -397,7 +346,6 @@ IsValidFileName (
   @return the valid filename.\r
 **/\r
 CHAR16 *\r
-EFIAPI\r
 EditGetDefaultFileName (\r
   IN CONST CHAR16 *Extension\r
   );\r
@@ -425,7 +373,6 @@ EditGetDefaultFileName (
   @retval EFI_INVALID_PARAMETER FileName was a directory.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ReadFileIntoBuffer (\r
   IN CONST CHAR16 *FileName,\r
   OUT VOID        **Buffer,\r