From nobody Sat Nov 2 16:19:44 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487749599748562.9326131165832; Tue, 21 Feb 2017 23:46:39 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8F1E182241; Tue, 21 Feb 2017 23:46:37 -0800 (PST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 323C88216E for ; Tue, 21 Feb 2017 23:46:36 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2017 23:46:36 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by orsmga003.jf.intel.com with ESMTP; 21 Feb 2017 23:46:35 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,193,1484035200"; d="scan'208";a="936736463" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Wed, 22 Feb 2017 15:46:29 +0800 Message-Id: <20170222074630.545800-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170222074630.545800-1-ruiyu.ni@intel.com> References: <20170222074630.545800-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH 1/2] ShellPkg/comp: Rename variable names to proper ones X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jaben Carsey , Chen A Chen MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Chen A Chen The change doesn't impact the functionality. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chen A Chen Cc: Jaben Carsey Reviewed-by: Jaben Carsey --- ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c | 46 +++++++++++-------= ---- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c b/ShellPkg/= Library/UefiShellDebug1CommandsLib/Comp.c index 2ab7dd3..829c49a 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Comp.c @@ -2,7 +2,7 @@ Main file for Comp shell Debug1 function. =20 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -31,11 +31,14 @@ ShellCommandRunComp ( EFI_STATUS Status; LIST_ENTRY *Package; CHAR16 *ProblemParam; + CHAR16 *FileName1; + CHAR16 *FileName2; + CONST CHAR16 *TempParam; SHELL_STATUS ShellStatus; UINTN LoopVar; SHELL_FILE_HANDLE FileHandle1; SHELL_FILE_HANDLE FileHandle2; - UINT8 ErrorCount; + UINT8 DifferentCount; UINT64 Size1; UINT64 Size2; UINT8 DataFromFile1; @@ -48,12 +51,9 @@ ShellCommandRunComp ( UINT8 ADF_File23; UINTN DataSizeFromFile1; UINTN DataSizeFromFile2; - CHAR16 *FileName1; - CHAR16 *FileName2; - CONST CHAR16 *TempParam; - UINTN ErrorAddress; + UINTN DiffPointAddress; =20 - ErrorCount =3D 0; + DifferentCount =3D 0; ShellStatus =3D SHELL_SUCCESS; Status =3D EFI_SUCCESS; FileName1 =3D NULL; @@ -125,12 +125,12 @@ ShellCommandRunComp ( ASSERT_EFI_ERROR(Status); if (Size1 !=3D Size2) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_SIZE_FAIL),= gShellDebug1HiiHandle); - ErrorCount++; + DifferentCount++; ShellStatus =3D SHELL_NOT_EQUAL; } } if (ShellStatus =3D=3D SHELL_SUCCESS) { - for (LoopVar =3D 0 ; LoopVar < Size1 && ErrorCount <=3D 10 ; LoopV= ar++) { + for (LoopVar =3D 0 ; LoopVar < Size1 && DifferentCount <=3D 10 ; L= oopVar++) { DataSizeFromFile1 =3D 1; DataSizeFromFile2 =3D 1; Status =3D gEfiShellProtocol->ReadFile(FileHandle1, &DataSizeFro= mFile1, &DataFromFile1); @@ -138,7 +138,7 @@ ShellCommandRunComp ( Status =3D gEfiShellProtocol->ReadFile(FileHandle2, &DataSizeFro= mFile2, &DataFromFile2); ASSERT_EFI_ERROR(Status); if (DataFromFile1 !=3D DataFromFile2) { - ErrorAddress =3D LoopVar; + DiffPointAddress =3D LoopVar; ADF_File11 =3D 0; ADF_File12 =3D 0; ADF_File13 =3D 0; @@ -188,13 +188,13 @@ ShellCommandRunComp ( NULL, STRING_TOKEN (STR_COMP_SPOT_FAIL4), gShellDebug1HiiHandle, - ++ErrorCount, + ++DifferentCount, FileName1, - ErrorAddress, + DiffPointAddress, DataFromFile1, ADF_File11, ADF_File12, ADF_File13, DataFromFile1, ADF_File11, ADF_File12, ADF_File13, FileName2, - ErrorAddress, + DiffPointAddress, DataFromFile2, ADF_File21, ADF_File22, ADF_File23, DataFromFile2, ADF_File21, ADF_File22, ADF_File23 ); @@ -205,13 +205,13 @@ ShellCommandRunComp ( NULL, STRING_TOKEN (STR_COMP_SPOT_FAIL3), gShellDebug1HiiHandle, - ++ErrorCount, + ++DifferentCount, FileName1, - ErrorAddress, + DiffPointAddress, DataFromFile1, ADF_File11, ADF_File12, DataFromFile1, ADF_File11, ADF_File12, FileName2, - ErrorAddress, + DiffPointAddress, DataFromFile2, ADF_File21, ADF_File22, DataFromFile2, ADF_File21, ADF_File22 ); @@ -222,13 +222,13 @@ ShellCommandRunComp ( NULL, STRING_TOKEN (STR_COMP_SPOT_FAIL2), gShellDebug1HiiHandle, - ++ErrorCount, + ++DifferentCount, FileName1, - ErrorAddress, + DiffPointAddress, DataFromFile1, ADF_File11, DataFromFile1, ADF_File11, FileName2, - ErrorAddress, + DiffPointAddress, DataFromFile2, ADF_File21, DataFromFile2, ADF_File21 ); @@ -239,13 +239,13 @@ ShellCommandRunComp ( NULL, STRING_TOKEN (STR_COMP_SPOT_FAIL1), gShellDebug1HiiHandle, - ++ErrorCount, + ++DifferentCount, FileName1, - ErrorAddress, + DiffPointAddress, DataFromFile1, DataFromFile1, FileName2, - ErrorAddress, + DiffPointAddress, DataFromFile2, DataFromFile2 ); @@ -253,7 +253,7 @@ ShellCommandRunComp ( ShellStatus =3D SHELL_NOT_EQUAL; } } - if (ErrorCount =3D=3D 0) { + if (DifferentCount =3D=3D 0) { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_PASS= ), gShellDebug1HiiHandle); } else { ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_FOOTER_FAIL= ), gShellDebug1HiiHandle); --=20 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel