ShellPkg: Clean up source files

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

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
index 3632ca8a7a4eb1e16db1a252067b1741f5e551b2..24f988cca24d5a9dab87746d6307ac37eb6a48a5 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
@@ -2,7 +2,7 @@
   Main file for Dblk shell Debug1 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
   Main file for Dblk shell Debug1 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r

-  Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2005 - 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
   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


@@ -69,11 +69,11 @@ DisplayTheBlocks(
   Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer);\r
   if (!EFI_ERROR(Status) && Buffer != NULL) {\r
     ShellPrintHiiEx(\r
   Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer);\r
   if (!EFI_ERROR(Status) && Buffer != NULL) {\r
     ShellPrintHiiEx(\r

-      -1, \r
-      -1, \r
-      NULL, \r
-      STRING_TOKEN (STR_DBLK_HEADER), \r
-      gShellDebug1HiiHandle, \r
+      -1,\r
+      -1,\r
+      NULL,\r
+      STRING_TOKEN (STR_DBLK_HEADER),\r
+      gShellDebug1HiiHandle,\r

       Lba,\r
       BufferSize,\r
       BlockIo\r
       Lba,\r
       BufferSize,\r
       BlockIo\r


@@ -81,7 +81,7 @@ DisplayTheBlocks(
 \r
     DumpHex(2,0,BufferSize,Buffer);\r
   } else {\r
 \r
     DumpHex(2,0,BufferSize,Buffer);\r
   } else {\r

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_READ_FAIL), gShellDebug1HiiHandle, L"dblk", L"BlockIo");  \r
+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_READ_FAIL), gShellDebug1HiiHandle, L"dblk", L"BlockIo");\r

     ShellStatus = SHELL_DEVICE_ERROR;\r
   }\r
 \r
     ShellStatus = SHELL_DEVICE_ERROR;\r
   }\r
 \r


@@ -135,7 +135,7 @@ ShellCommandRunDblk (
   Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);\r
   if (EFI_ERROR(Status)) {\r
     if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
   Status = ShellCommandLineParse (EmptyParamList, &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), gShellDebug1HiiHandle, L"dblk", ProblemParam);  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"dblk", ProblemParam);\r

       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       FreePool(ProblemParam);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r


@@ -143,10 +143,10 @@ ShellCommandRunDblk (
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 4) {\r
     }\r
   } else {\r
     if (ShellCommandLineGetCount(Package) > 4) {\r

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"dblk");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"dblk");\r

       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetCount(Package) < 2) {\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetCount(Package) < 2) {\r

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"dblk");  \r
+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"dblk");\r

       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       //\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
       //\r


@@ -160,7 +160,7 @@ ShellCommandRunDblk (
         Lba = 0;\r
       } else {\r
         if (!ShellIsHexOrDecimalNumber(LbaString, TRUE, FALSE)) {\r
         Lba = 0;\r
       } else {\r
         if (!ShellIsHexOrDecimalNumber(LbaString, TRUE, FALSE)) {\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", LbaString);  \r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", LbaString);\r

           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
         ShellConvertStringToUint64(LbaString, &Lba, TRUE, FALSE);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
         ShellConvertStringToUint64(LbaString, &Lba, TRUE, FALSE);\r


@@ -170,29 +170,29 @@ ShellCommandRunDblk (
         BlockCount = 1;\r
       } else {\r
         if (!ShellIsHexOrDecimalNumber(BlockCountString, TRUE, FALSE)) {\r
         BlockCount = 1;\r
       } else {\r
         if (!ShellIsHexOrDecimalNumber(BlockCountString, TRUE, FALSE)) {\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);  \r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);\r

           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
         ShellConvertStringToUint64(BlockCountString, &BlockCount, TRUE, FALSE);\r
         if (BlockCount > 0x10) {\r
           BlockCount = 0x10;\r
         } else if (BlockCount == 0) {\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
         ShellConvertStringToUint64(BlockCountString, &BlockCount, TRUE, FALSE);\r
         if (BlockCount > 0x10) {\r
           BlockCount = 0x10;\r
         } else if (BlockCount == 0) {\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);  \r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);\r

           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
       }\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         }\r
       }\r

-      \r
+\r

       if (ShellStatus == SHELL_SUCCESS) {\r
         //\r
         // do the work if we have a valid block identifier\r
         //\r
         if (gEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r
       if (ShellStatus == SHELL_SUCCESS) {\r
         //\r
         // do the work if we have a valid block identifier\r
         //\r
         if (gEfiShellProtocol->GetDevicePathFromMap(BlockName) == NULL) {\r

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockName);  \r
+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockName);\r

           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           DevPath = (EFI_DEVICE_PATH_PROTOCOL*)gEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
           if (gBS->LocateDevicePath(&gEfiBlockIoProtocolGuid, &DevPath, NULL) == EFI_NOT_FOUND) {\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           DevPath = (EFI_DEVICE_PATH_PROTOCOL*)gEfiShellProtocol->GetDevicePathFromMap(BlockName);\r
           if (gBS->LocateDevicePath(&gEfiBlockIoProtocolGuid, &DevPath, NULL) == EFI_NOT_FOUND) {\r

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MAP_PROTOCOL), gShellDebug1HiiHandle, L"dblk", BlockName, L"BlockIo");  \r
+            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_MAP_PROTOCOL), gShellDebug1HiiHandle, L"dblk", BlockName, L"BlockIo");\r

             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
             ShellStatus = DisplayTheBlocks(gEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
             ShellStatus = DisplayTheBlocks(gEfiShellProtocol->GetDevicePathFromMap(BlockName), Lba, (UINT8)BlockCount);\r