ShellPkg/Dh: Fix coding style issues

The change doesn't impact the functionality.

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

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 0ac49e1e7877323aaa3f53a561d2d36df50fb60c..2773842722d502c1a997efd8102fd3974e21179a 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -642,11 +642,8 @@ DisplayDriverModelHandle (
   @param[in] DriverInfo       TRUE to show all info about the handle.\r
   @param[in] Multiple         TRUE indicates more than  will be output,\r
                               FALSE for a single one.\r
-\r
-  @retval SHELL_SUCCESS           The operation was successful.\r
-  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
-SHELL_STATUS\r
+VOID\r
 DoDhByHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST BOOLEAN    Verbose,\r
@@ -656,10 +653,8 @@ DoDhByHandle(
   IN CONST BOOLEAN    Multiple\r
   )\r
 {\r
-  CHAR16              *ProtocolInfoString;\r
-  SHELL_STATUS        ShellStatus;\r
+  CHAR16 *ProtocolInfoString;\r
 \r
-  ShellStatus         = SHELL_SUCCESS;\r
   ProtocolInfoString  = NULL;\r
 \r
   if (!Sfo) {\r
@@ -672,7 +667,8 @@ DoDhByHandle(
         STRING_TOKEN (STR_DH_OUTPUT),\r
         gShellDriver1HiiHandle,\r
         ConvertHandleToHandleIndex(TheHandle),\r
-        ProtocolInfoString==NULL?L"":ProtocolInfoString);\r
+        ProtocolInfoString==NULL?L"":ProtocolInfoString\r
+      );\r
     } else {\r
       ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE);\r
       ShellPrintHiiEx(\r
@@ -683,7 +679,8 @@ DoDhByHandle(
         gShellDriver1HiiHandle,\r
         ConvertHandleToHandleIndex(TheHandle),\r
         TheHandle,\r
-        ProtocolInfoString==NULL?L"":ProtocolInfoString);\r
+        ProtocolInfoString==NULL?L"":ProtocolInfoString\r
+      );\r
     }\r
 \r
     if (DriverInfo) {\r
@@ -702,16 +699,13 @@ DoDhByHandle(
         L"ControllerName",\r
         ConvertHandleToHandleIndex(TheHandle),\r
         L"DevPath",\r
-        ProtocolInfoString==NULL?L"":ProtocolInfoString);\r
-\r
-\r
+        ProtocolInfoString==NULL?L"":ProtocolInfoString\r
+      );\r
   }\r
 \r
-\r
   if (ProtocolInfoString != NULL) {\r
     FreePool(ProtocolInfoString);\r
   }\r
-  return (ShellStatus);\r
 }\r
 \r
 /**\r
@@ -723,8 +717,8 @@ DoDhByHandle(
   @param[in] Language         Language string per UEFI specification.\r
   @param[in] DriverInfo       TRUE to show all info about the handle.\r
 \r
-  @retval SHELL_SUCCESS           The operation was successful.\r
-  @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
+  @retval SHELL_SUCCESS       The operation was successful.\r
+  @retval SHELL_ABORTED       The operation was aborted.\r
 **/\r
 SHELL_STATUS\r
 DoDhForHandleList(\r
@@ -740,15 +734,8 @@ DoDhForHandleList(
 \r
   ShellStatus       = SHELL_SUCCESS;\r
 \r
-  for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL && ShellStatus == SHELL_SUCCESS; HandleWalker++) {\r
-    ShellStatus = DoDhByHandle(\r
-          *HandleWalker,\r
-          Verbose,\r
-          Sfo,\r
-          Language,\r
-          DriverInfo,\r
-          TRUE\r
-         );\r
+  for ( HandleWalker = HandleList; HandleWalker != NULL && *HandleWalker != NULL; HandleWalker++ ) {\r
+    DoDhByHandle (*HandleWalker, Verbose, Sfo, Language, DriverInfo, TRUE);\r
     if (ShellGetExecutionBreakFlag ()) {\r
       ShellStatus = SHELL_ABORTED;\r
       break;\r
@@ -862,10 +849,10 @@ ShellCommandRunDh (
   SHELL_STATUS        ShellStatus;\r
   CHAR8               *Language;\r
   CONST CHAR16        *Lang;\r
-  CONST CHAR16        *Temp2;\r
-  BOOLEAN             SfoMode;\r
-  BOOLEAN             FlagD;\r
-  BOOLEAN             Verbose;\r
+  CONST CHAR16        *RawValue;\r
+  BOOLEAN             SfoFlag;\r
+  BOOLEAN             DriverFlag;\r
+  BOOLEAN             VerboseFlag;\r
   UINT64              Intermediate;\r
 \r
   ShellStatus         = SHELL_SUCCESS;\r
@@ -900,30 +887,32 @@ ShellCommandRunDh (
       return (SHELL_INVALID_PARAMETER);\r
     }\r
 \r
-    Lang = ShellCommandLineGetValue(Package, L"-l");\r
-    if (Lang != NULL) {\r
-      Language = AllocateZeroPool(StrSize(Lang));\r
-      AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
-    } else if (!ShellCommandLineGetFlag(Package, L"-l")){\r
+    if (ShellCommandLineGetFlag(Package, L"-l")) {\r
+      Lang = ShellCommandLineGetValue(Package, L"-l");\r
+      if (Lang != NULL) {\r
+        Language = AllocateZeroPool(StrSize(Lang));\r
+        AsciiSPrint(Language, StrSize(Lang), "%S", Lang);\r
+      } else {\r
+        ASSERT(Language == NULL);\r
+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh", L"-l");\r
+        ShellCommandLineFreeVarList(Package);\r
+        return (SHELL_INVALID_PARAMETER);\r
+      }\r
+    } else {\r
       Language = AllocateZeroPool(10);\r
       AsciiSPrint(Language, 10, "en-us");\r
-    } else {\r
-      ASSERT(Language == NULL);\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh",  L"-l");  \r
-      ShellCommandLineFreeVarList (Package);\r
-      return (SHELL_INVALID_PARAMETER);\r
     }\r
 \r
-    SfoMode = ShellCommandLineGetFlag(Package, L"-sfo");\r
-    FlagD   = ShellCommandLineGetFlag(Package, L"-d");\r
-    Verbose = (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose"));\r
+    SfoFlag     = ShellCommandLineGetFlag (Package, L"-sfo");\r
+    DriverFlag  = ShellCommandLineGetFlag (Package, L"-d");\r
+    VerboseFlag = (BOOLEAN)(ShellCommandLineGetFlag (Package, L"-v") || ShellCommandLineGetFlag (Package, L"-verbose"));\r
 \r
-    if (ShellCommandLineGetFlag(Package, L"-p")) {\r
-      if (ShellCommandLineGetCount(Package) > 1) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");  \r
+    if (ShellCommandLineGetFlag (Package, L"-p")) {\r
+      if (ShellCommandLineGetCount (Package) > 1) {\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else if (ShellCommandLineGetValue(Package, L"-p") == NULL) {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh",  L"-p");  \r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh",  L"-p");\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
         //\r
@@ -931,41 +920,41 @@ ShellCommandRunDh (
         //\r
         ShellStatus = DoDhByProtocol(\r
           ShellCommandLineGetValue(Package, L"-p"),\r
-          Verbose,\r
-          SfoMode,\r
-          Lang==NULL?NULL:Language,\r
-          FlagD\r
-         );\r
+          VerboseFlag,\r
+          SfoFlag,\r
+          Language,\r
+          DriverFlag\r
+        );\r
       }\r
     } else {\r
-      Temp2 = ShellCommandLineGetRawValue(Package, 1);\r
-      if (Temp2 == NULL) {\r
+      RawValue = ShellCommandLineGetRawValue(Package, 1);\r
+      if (RawValue == NULL) {\r
         //\r
         // Print everything\r
         //\r
         ShellStatus = DoDhForAll(\r
-          SfoMode,\r
-          Verbose,\r
-          Lang==NULL?NULL:Language,\r
-          FlagD\r
+          SfoFlag,\r
+          VerboseFlag,\r
+          Language,\r
+          DriverFlag\r
          );\r
       } else {\r
-        Status = ShellConvertStringToUint64(Temp2, &Intermediate, TRUE, FALSE);\r
+        Status = ShellConvertStringToUint64(RawValue, &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"dh", Temp2);  \r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"dh", RawValue);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           //\r
           // print 1 handle\r
           //\r
-          ShellStatus = DoDhByHandle(\r
+          DoDhByHandle(\r
             ConvertHandleIndexToHandle((UINTN)Intermediate),\r
-            Verbose,\r
-            SfoMode,\r
-            Lang==NULL?NULL:Language,\r
-            FlagD,\r
+            VerboseFlag,\r
+            SfoFlag,\r
+            Language,\r
+            DriverFlag,\r
             FALSE\r
-           );\r
+          );\r
         }\r
       }\r
     }\r