ShellPkg: Clean up source files

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index 4389ce00cb887c2dbdec58973aec9f02543f6217..0658f9b87a5495dcf8ddc868f5f4e97c7d9528fb 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -1,8 +1,8 @@
 /** @file\r
   Main file for DevTree shell Driver1 function.\r
 \r
-  Copyright (c) 2014 - 2015, Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2018, 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
@@ -34,7 +34,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r
-EFIAPI\r
 DoDevTreeForHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Lang OPTIONAL,\r
@@ -57,13 +56,14 @@ DoDevTreeForHandle(
   ChildHandleBuffer   = NULL;\r
   ChildCount          = 0;\r
 \r
-  ASSERT(TheHandle    != NULL);\r
-  \r
+  ASSERT (TheHandle != NULL);\r
+  ASSERT (HiiString != NULL);\r
+\r
   if (ShellGetExecutionBreakFlag()) {\r
     ShellStatus = SHELL_ABORTED;\r
     return ShellStatus;\r
   }\r
-  \r
+\r
   //\r
   // We want controller handles.  they will not have LoadedImage or DriverBinding (or others...)\r
   //\r
@@ -91,10 +91,10 @@ DoDevTreeForHandle(
     return SHELL_SUCCESS;\r
   }\r
 \r
-  FormatString        = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));\r
-\r
-  ASSERT(HiiString    != NULL);\r
-  ASSERT(FormatString != NULL);\r
+  FormatString = AllocateZeroPool(StrSize(HiiString) + (10)*sizeof(FormatString[0]));\r
+  if (FormatString == NULL) {\r
+    return SHELL_OUT_OF_RESOURCES;\r
+  }\r
 \r
   //\r
   // we generate the format string on the fly so that we can control the\r
@@ -184,7 +184,7 @@ ShellCommandRunDevTree (
   Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"devtree", ProblemParam);\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
@@ -192,7 +192,7 @@ ShellCommandRunDevTree (
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 2) {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devtree");\r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     }\r
@@ -206,7 +206,7 @@ ShellCommandRunDevTree (
 //      AsciiSPrint(Language, 10, "en-us");\r
     } else {\r
       ASSERT(Language == NULL);\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree",  L"-l");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devtree",  L"-l");\r
       ShellCommandLineFreeVarList (Package);\r
       return (SHELL_INVALID_PARAMETER);\r
     }\r
@@ -259,7 +259,7 @@ ShellCommandRunDevTree (
     } else {\r
       Status = ShellConvertStringToUint64(Lang, &Intermediate, TRUE, FALSE);\r
       if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);  \r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"devtree", Lang);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
         ShellStatus = DoDevTreeForHandle(ConvertHandleIndexToHandle((UINTN)Intermediate), Language, FlagD, 0, HiiString);\r