From: "Carsey, Jaben" <jaben.carsey@intel.com>
To: "Ni, Ruiyu" <ruiyu.ni@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Chen, Chen A" <chen.a.chen@intel.com>,
"Carsey, Jaben" <jaben.carsey@intel.com>
Subject: Re: [PATCH 1/2] ShellPkg/comp: Rename variable names to proper ones
Date: Mon, 27 Feb 2017 16:36:44 +0000 [thread overview]
Message-ID: <CB6E33457884FA40993F35157061515C54B89FD5@FMSMSX103.amr.corp.intel.com> (raw)
In-Reply-To: <20170222074630.545800-2-ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Tuesday, February 21, 2017 11:46 PM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Chen, Chen A
> <chen.a.chen@intel.com>
> Subject: [edk2] [PATCH 1/2] ShellPkg/comp: Rename variable names to
> proper ones
> Importance: High
>
> From: Chen A Chen <chen.a.chen@intel.com>
>
> 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>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
> 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.
>
> (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
> - Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD
> License
> which accompanies this distribution. The full text of the license may be
> 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;
>
> - ErrorCount = 0;
> + DifferentCount = 0;
> ShellStatus = SHELL_SUCCESS;
> Status = EFI_SUCCESS;
> FileName1 = NULL;
> @@ -125,12 +125,12 @@ ShellCommandRunComp (
> ASSERT_EFI_ERROR(Status);
> if (Size1 != Size2) {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_COMP_SIZE_FAIL),
> gShellDebug1HiiHandle);
> - ErrorCount++;
> + DifferentCount++;
> ShellStatus = SHELL_NOT_EQUAL;
> }
> }
> if (ShellStatus == SHELL_SUCCESS) {
> - for (LoopVar = 0 ; LoopVar < Size1 && ErrorCount <= 10 ; LoopVar++) {
> + for (LoopVar = 0 ; LoopVar < Size1 && DifferentCount <= 10 ;
> LoopVar++) {
> DataSizeFromFile1 = 1;
> DataSizeFromFile2 = 1;
> Status = gEfiShellProtocol->ReadFile(FileHandle1, &DataSizeFromFile1,
> &DataFromFile1);
> @@ -138,7 +138,7 @@ ShellCommandRunComp (
> Status = gEfiShellProtocol->ReadFile(FileHandle2, &DataSizeFromFile2,
> &DataFromFile2);
> ASSERT_EFI_ERROR(Status);
> if (DataFromFile1 != DataFromFile2) {
> - ErrorAddress = LoopVar;
> + DiffPointAddress = LoopVar;
> ADF_File11 = 0;
> ADF_File12 = 0;
> ADF_File13 = 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 = SHELL_NOT_EQUAL;
> }
> }
> - if (ErrorCount == 0) {
> + if (DifferentCount == 0) {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
> (STR_COMP_FOOTER_PASS), gShellDebug1HiiHandle);
> } else {
> ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN
> (STR_COMP_FOOTER_FAIL), gShellDebug1HiiHandle);
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2017-02-27 16:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-22 7:46 [PATCH 0/2] Add "-n/-s" support to "comp" command Ruiyu Ni
2017-02-22 7:46 ` [PATCH 1/2] ShellPkg/comp: Rename variable names to proper ones Ruiyu Ni
2017-02-27 16:36 ` Carsey, Jaben [this message]
2017-02-22 7:46 ` [PATCH 2/2] ShellPkg/comp: Add "-n <diff-count>"/"-s <diff-byte>" support Ruiyu Ni
2017-02-27 16:36 ` Carsey, Jaben
2017-02-28 7:39 ` Ard Biesheuvel
2017-02-28 8:06 ` Ni, Ruiyu
2017-02-28 8:12 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CB6E33457884FA40993F35157061515C54B89FD5@FMSMSX103.amr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox