ShellPkg: remove redudant code. call existing API.

[mirror_edk2.git] / ShellPkg / Library / UefiShellDriver1CommandsLib / Unload.c

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index 4f0ec1203f16730c4ca047b143f4af43a5fb3db3..cb2c07b69d386adf4b18b54540ea6200055fb251 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main file for Unload shell Driver1 function.\r
 \r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2014, 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
@@ -28,42 +28,14 @@ DumpLoadedImageProtocolInfo (
   IN EFI_HANDLE   TheHandle\r
   )\r
 {\r
-  EFI_LOADED_IMAGE_PROTOCOL         *Image;\r
-  EFI_STATUS                        Status;\r
-  CHAR16                            *DevicePathText;\r
-  CHAR16                            *CodeTypeText;\r
-  CHAR16                            *DataTypeText;\r
-  CHAR8                             *PdbPointer;\r
+  CHAR16 *TheString;\r
 \r
-  Image = NULL;\r
-\r
-  Status = gBS->OpenProtocol(TheHandle, &gEfiLoadedImageProtocolGuid, (VOID**)&Image, gImageHandle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);\r
-  if (EFI_ERROR(Status)) {\r
-    return (EFI_INVALID_PARAMETER);\r
-  }\r
-  DevicePathText = ConvertDevicePathToText(Image->FilePath, TRUE, TRUE);\r
-  CodeTypeText   = ConvertMemoryType(Image->ImageCodeType);\r
-  DataTypeText   = ConvertMemoryType(Image->ImageDataType);\r
-  PdbPointer     = (CHAR8*)PeCoffLoaderGetPdbPointer(Image->ImageBase);\r
-  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_UNLOAD_VERBOSE), gShellDriver1HiiHandle,\r
-    ConvertHandleToHandleIndex(TheHandle),\r
-    TheHandle,\r
-    Image,\r
-    Image->ParentHandle,\r
-    Image->SystemTable,\r
-    Image->DeviceHandle,\r
-    DevicePathText,\r
-    PdbPointer,\r
-    Image->ImageBase,\r
-    Image->ImageSize,\r
-    CodeTypeText,\r
-    DataTypeText\r
-    );\r
-\r
-  SHELL_FREE_NON_NULL(DevicePathText);\r
-  SHELL_FREE_NON_NULL(CodeTypeText);\r
-  SHELL_FREE_NON_NULL(DataTypeText);\r
+  TheString = GetProtocolInformationDump(TheHandle, &gEfiLoadedImageProtocolGuid, TRUE);\r
+  \r
+  ShellPrintEx(-1, -1, L"%s", TheString);\r
 \r
+  SHELL_FREE_NON_NULL(TheString);\r
+  \r
   return (EFI_SUCCESS);\r
 }\r
 \r