ShellPkg/UefiShellAcpiViewCommandLib: Fix ECC issues

[mirror_edk2.git] / ShellPkg / Library / UefiShellAcpiViewCommandLib / AcpiView.c

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index f5602e94291c26f91513d753601d09ddff73a4dd..47ce93f104b024540b3140e3acd92b8a1dccccb1 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -122,8 +122,11 @@ DumpAcpiTableToFile (
 {\r
   EFI_STATUS         Status;\r
   CHAR16             FileNameBuffer[MAX_FILE_NAME_LEN];\r
-  SHELL_FILE_HANDLE  DumpFileHandle = NULL;\r
-  UINTN              TransferBytes = Length;\r
+  SHELL_FILE_HANDLE  DumpFileHandle;\r
+  UINTN              TransferBytes;\r
+\r
+  DumpFileHandle = NULL;\r
+  TransferBytes = Length;\r
 \r
   UnicodeSPrint (\r
     FileNameBuffer,\r
@@ -186,20 +189,25 @@ ProcessTableReportOptions (
   )\r
 {\r
   UINTN   OriginalAttribute;\r
-  UINT8*  SignaturePtr = (UINT8*)(UINTN)&Signature;\r
-  BOOLEAN Log = FALSE;\r
-  BOOLEAN HighLight = GetColourHighlighting ();\r
+  UINT8*  SignaturePtr;\r
+  BOOLEAN Log;\r
+  BOOLEAN HighLight;\r
+\r
+  SignaturePtr = (UINT8*)(UINTN)&Signature;\r
+  Log = FALSE;\r
+  HighLight = GetColourHighlighting ();\r
+\r
   switch (GetReportOption ()) {\r
-    case EREPORT_ALL:\r
+    case ReportAll:\r
       Log = TRUE;\r
       break;\r
-    case EREPORT_SELECTED:\r
+    case ReportSelected:\r
       if (Signature == GetSelectedAcpiTable ()) {\r
         Log = TRUE;\r
         mSelectedAcpiTableFound = TRUE;\r
       }\r
       break;\r
-    case EREPORT_TABLE_LIST:\r
+    case ReportTableList:\r
       if (mTableCount == 0) {\r
         if (HighLight) {\r
           OriginalAttribute = gST->ConOut->Mode->Attribute;\r
@@ -223,13 +231,13 @@ ProcessTableReportOptions (
         SignaturePtr[3]\r
         );\r
       break;\r
-    case EREPORT_DUMP_BIN_FILE:\r
+    case ReportDumpBinFile:\r
       if (Signature == GetSelectedAcpiTable ()) {\r
         mSelectedAcpiTableFound = TRUE;\r
         DumpAcpiTableToFile (TablePtr, Length);\r
       }\r
       break;\r
-    case EREPORT_MAX:\r
+    case ReportMax:\r
       // We should never be here.\r
       // This case is only present to prevent compiler warning.\r
       break;\r
@@ -273,9 +281,11 @@ ConvertStrToAcpiSignature (
   IN  CONST CHAR16* Str\r
   )\r
 {\r
-  UINT8 Index = 0;\r
+  UINT8 Index;\r
   CHAR8 Ptr[4];\r
 \r
+  Index = 0;\r
+\r
   // Convert to Upper case and convert to ASCII\r
   while ((Index < 4) && (Str[Index] != 0)) {\r
     if (Str[Index] >= L'a' && Str[Index] <= L'z') {\r
@@ -371,12 +381,12 @@ AcpiView (
   }\r
 \r
   ReportOption = GetReportOption ();\r
-  if (EREPORT_TABLE_LIST != ReportOption) {\r
-    if (((EREPORT_SELECTED == ReportOption)  ||\r
-         (EREPORT_DUMP_BIN_FILE == ReportOption)) &&\r
+  if (ReportTableList != ReportOption) {\r
+    if (((ReportSelected == ReportOption)  ||\r
+         (ReportDumpBinFile == ReportOption)) &&\r
         (!mSelectedAcpiTableFound)) {\r
       Print (L"\nRequested ACPI Table not found.\n");\r
-    } else if (EREPORT_DUMP_BIN_FILE != ReportOption) {\r
+    } else if (ReportDumpBinFile != ReportOption) {\r
       OriginalAttribute = gST->ConOut->Mode->Attribute;\r
 \r
       Print (L"\nTable Statistics:\n");\r
@@ -426,15 +436,15 @@ ShellCommandRunAcpiView (
   )\r
 {\r
   EFI_STATUS         Status;\r
-  SHELL_STATUS       ShellStatus = SHELL_SUCCESS;\r
-  LIST_ENTRY*        Package = NULL;\r
+  SHELL_STATUS       ShellStatus;\r
+  LIST_ENTRY*        Package;\r
   CHAR16*            ProblemParam;\r
   CONST CHAR16*      Temp;\r
   CHAR8              ColourOption[8];\r
-  SHELL_FILE_HANDLE  TmpDumpFileHandle = NULL;\r
+  SHELL_FILE_HANDLE  TmpDumpFileHandle;\r
 \r
   // Set Defaults\r
-  mReportType = EREPORT_ALL;\r
+  mReportType = ReportAll;\r
   mTableCount = 0;\r
   mBinTableCount = 0;\r
   mSelectedAcpiTable = 0;\r
@@ -443,6 +453,10 @@ ShellCommandRunAcpiView (
   mVerbose = TRUE;\r
   mConsistencyCheck = TRUE;\r
 \r
+  ShellStatus = SHELL_SUCCESS;\r
+  Package = NULL;\r
+  TmpDumpFileHandle = NULL;\r
+\r
   // Reset The error/warning counters\r
   ResetErrorCount ();\r
   ResetWarningCount ();\r
@@ -547,19 +561,19 @@ ShellCommandRunAcpiView (
       }\r
 \r
       if (ShellCommandLineGetFlag (Package, L"-l")) {\r
-        mReportType = EREPORT_TABLE_LIST;\r
+        mReportType = ReportTableList;\r
       } else {\r
         mSelectedAcpiTableName = ShellCommandLineGetValue (Package, L"-s");\r
         if (mSelectedAcpiTableName != NULL) {\r
           mSelectedAcpiTable = (UINT32)ConvertStrToAcpiSignature (\r
                                          mSelectedAcpiTableName\r
                                          );\r
-          mReportType = EREPORT_SELECTED;\r
+          mReportType = ReportSelected;\r
 \r
           if (ShellCommandLineGetFlag (Package, L"-d"))  {\r
             // Create a temporary file to check if the media is writable.\r
             CHAR16 FileNameBuffer[MAX_FILE_NAME_LEN];\r
-            mReportType = EREPORT_DUMP_BIN_FILE;\r
+            mReportType = ReportDumpBinFile;\r
 \r
             UnicodeSPrint (\r
               FileNameBuffer,\r