ShellPkg/comp: Rename variable names to proper ones

The change doesn't impact the functionality.

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

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c
index 2ab7dd3a5aa4ee30134d79a78345f9a817ebcce7..829c49ac0e7056da9eac7199dd51e3fd61b715e0 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c
@@ -2,7 +2,7 @@
   Main file for Comp shell Debug1 function.\r
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
-  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2017, 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
@@ -31,11 +31,14 @@ ShellCommandRunComp (
   EFI_STATUS          Status;\r
   LIST_ENTRY          *Package;\r
   CHAR16              *ProblemParam;\r
+  CHAR16              *FileName1;\r
+  CHAR16              *FileName2;\r
+  CONST CHAR16        *TempParam;\r
   SHELL_STATUS        ShellStatus;\r
   UINTN               LoopVar;\r
   SHELL_FILE_HANDLE   FileHandle1;\r
   SHELL_FILE_HANDLE   FileHandle2;\r
-  UINT8               ErrorCount;\r
+  UINT8               DifferentCount;\r
   UINT64              Size1;\r
   UINT64              Size2;\r
   UINT8               DataFromFile1;\r
@@ -48,12 +51,9 @@ ShellCommandRunComp (
   UINT8               ADF_File23;\r
   UINTN               DataSizeFromFile1;\r
   UINTN               DataSizeFromFile2;\r
-  CHAR16              *FileName1;\r
-  CHAR16              *FileName2;\r
-  CONST CHAR16        *TempParam;\r
-  UINTN               ErrorAddress;\r
+  UINTN               DiffPointAddress;\r
 \r
-  ErrorCount          = 0;\r
+  DifferentCount          = 0;\r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
   FileName1           = NULL;\r
@@ -125,12 +125,12 @@ ShellCommandRunComp (
         ASSERT_EFI_ERROR(Status);\r
         if (Size1 != Size2) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_SIZE_FAIL), gShellDebug1HiiHandle);\r
-          ErrorCount++;\r
+          DifferentCount++;\r
           ShellStatus = SHELL_NOT_EQUAL;\r
         }\r
       }\r
       if (ShellStatus == SHELL_SUCCESS) {\r
-        for (LoopVar = 0 ; LoopVar < Size1 && ErrorCount <= 10 ; LoopVar++) {\r
+        for (LoopVar = 0 ; LoopVar < Size1 && DifferentCount <= 10 ; LoopVar++) {\r
           DataSizeFromFile1 = 1;\r
           DataSizeFromFile2 = 1;\r
           Status = gEfiShellProtocol->ReadFile(FileHandle1, &DataSizeFromFile1, &DataFromFile1);\r
@@ -138,7 +138,7 @@ ShellCommandRunComp (
           Status = gEfiShellProtocol->ReadFile(FileHandle2, &DataSizeFromFile2, &DataFromFile2);\r
           ASSERT_EFI_ERROR(Status);\r
           if (DataFromFile1 != DataFromFile2) {\r
-            ErrorAddress = LoopVar;\r
+            DiffPointAddress = LoopVar;\r
             ADF_File11 = 0;\r
             ADF_File12 = 0;\r
             ADF_File13 = 0;\r
@@ -188,13 +188,13 @@ ShellCommandRunComp (
                 NULL,\r
                 STRING_TOKEN (STR_COMP_SPOT_FAIL4),\r
                 gShellDebug1HiiHandle,\r
-                ++ErrorCount,\r
+                ++DifferentCount,\r
                 FileName1,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
                 DataFromFile1, ADF_File11, ADF_File12, ADF_File13,\r
                 FileName2,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile2, ADF_File21, ADF_File22, ADF_File23,\r
                 DataFromFile2, ADF_File21, ADF_File22, ADF_File23\r
                );\r
@@ -205,13 +205,13 @@ ShellCommandRunComp (
                 NULL,\r
                 STRING_TOKEN (STR_COMP_SPOT_FAIL3),\r
                 gShellDebug1HiiHandle,\r
-                ++ErrorCount,\r
+                ++DifferentCount,\r
                 FileName1,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile1, ADF_File11, ADF_File12,\r
                 DataFromFile1, ADF_File11, ADF_File12,\r
                 FileName2,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile2, ADF_File21, ADF_File22,\r
                 DataFromFile2, ADF_File21, ADF_File22\r
                );\r
@@ -222,13 +222,13 @@ ShellCommandRunComp (
                 NULL,\r
                 STRING_TOKEN (STR_COMP_SPOT_FAIL2),\r
                 gShellDebug1HiiHandle,\r
-                ++ErrorCount,\r
+                ++DifferentCount,\r
                 FileName1,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile1, ADF_File11,\r
                 DataFromFile1, ADF_File11,\r
                 FileName2,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile2, ADF_File21,\r
                 DataFromFile2, ADF_File21\r
                );\r
@@ -239,13 +239,13 @@ ShellCommandRunComp (
                 NULL,\r
                 STRING_TOKEN (STR_COMP_SPOT_FAIL1),\r
                 gShellDebug1HiiHandle,\r
-                ++ErrorCount,\r
+                ++DifferentCount,\r
                 FileName1,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile1,\r
                 DataFromFile1,\r
                 FileName2,\r
-                ErrorAddress,\r
+                DiffPointAddress,\r
                 DataFromFile2,\r
                 DataFromFile2\r
                );\r
@@ -253,7 +253,7 @@ ShellCommandRunComp (
             ShellStatus = SHELL_NOT_EQUAL;\r
           }\r
         }\r
-        if (ErrorCount == 0) {\r
+        if (DifferentCount == 0) {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);\r
         } else {\r
           ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);\r