From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 823DE1A1E6B for ; Wed, 19 Oct 2016 00:36:54 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP; 19 Oct 2016 00:36:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,513,1473145200"; d="scan'208";a="1046814269" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 19 Oct 2016 00:36:53 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 19 Oct 2016 00:36:52 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 19 Oct 2016 00:36:51 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.139]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.209]) with mapi id 14.03.0248.002; Wed, 19 Oct 2016 15:36:49 +0800 From: "Zhu, Yonghong" To: Gary Lin , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH 02/33] BaseTools: Fix typos in comments and variables Thread-Index: AQHSKdbMB19hh2r5HkCwkN59J3enCKCvY0wA Date: Wed, 19 Oct 2016 07:36:49 +0000 Message-ID: References: <20161019070138.16424-1-glin@suse.com> <20161019070138.16424-3-glin@suse.com> In-Reply-To: <20161019070138.16424-3-glin@suse.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 02/33] BaseTools: Fix typos in comments and variables 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: , X-List-Received-Date: Wed, 19 Oct 2016 07:36:54 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: Gary Lin [mailto:glin@suse.com]=20 Sent: Wednesday, October 19, 2016 3:01 PM To: edk2-devel@lists.01.org Cc: Zhu, Yonghong ; Gao, Liming Subject: [PATCH 02/33] BaseTools: Fix typos in comments and variables - Pacakge -> Package - outputed -> outputted - successull -> successfully - Libary -> Library - Pointion -> Position - paramter -> parameter Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Gary Lin --- BaseTools/Source/C/Common/Decompress.c | 6 +++--- BaseTools/Source/C/Common/Decompress.h | 4 ++-- BaseTools/Source/C/Common/ParseInf.c | 2 +- BaseTools/Source/C/EfiRom/EfiRom.c | 4 ++-- BaseTools/Source/C/GenCrc32/GenCrc32.c | 2 +- BaseTools/Source/C/GenFfs/GenFfs.c | 2 +- BaseTools/Source/C/GenFw/GenFw.c | 8 ++++---- BaseTools/Source/C/GenPage/GenPage.c | 2 +- BaseTools/Source/C/GenSec/GenSec.c | 14 +++++++------- BaseTools/Source/C/Split/Split.c | 6 +++--- BaseTools/Source/C/TianoCompress/TianoCompress.h | 4 ++-- BaseTools/Sour= ce/C/VfrCompile/Pccts/dlg/dlg_p.c | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/BaseTools/Source/C/Common/Decompress.c b/BaseTools/Source/C/Co= mmon/Decompress.c index 48578ea..d266b6f 100644 --- a/BaseTools/Source/C/Common/Decompress.c +++ b/BaseTools/Source/C/Common/Decompress.c @@ -675,7 +675,7 @@ Arguments: =20 Returns: =20 - EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successull retrieved. + EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successfully retrieved. EFI_INVALID_PARAMETER - The source data is corrupted =20 --*/ @@ -810,7 +810,7 @@ Arguments: =20 Returns: =20 - EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successull retrieved. + EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successfully retrieved. EFI_INVALID_PARAMETER - The source data is corrupted =20 --*/ @@ -840,7 +840,7 @@ Arguments: =20 Returns: =20 - EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successull retrieved. + EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successfully retrieved. EFI_INVALID_PARAMETER - The source data is corrupted =20 --*/ diff --git a/BaseTools/Source/C/Common/Decompress.h b/BaseTools/Source/C/Co= mmon/Decompress.h index 004804c..2899ed5 100644 --- a/BaseTools/Source/C/Common/Decompress.h +++ b/BaseTools/Source/C/Common/Decompress.h @@ -39,7 +39,7 @@ Arguments: =20 Returns: =20 - EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successull retrieved. + EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successfully retrieved. EFI_INVALID_PARAMETER - The source data is corrupted =20 **/ @@ -97,7 +97,7 @@ Arguments: =20 Returns: =20 - EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successull retrieved. + EFI_SUCCESS - The size of destination buffer and the size of s= cratch buffer are successfully retrieved. EFI_INVALID_PARAMETER - The source data is corrupted =20 **/ diff --git a/BaseTools/Source/C/Common/ParseInf.c b/BaseTools/Source/C/Comm= on/ParseInf.c index 9e85a88..0a204c8 100644 --- a/BaseTools/Source/C/Common/ParseInf.c +++ b/BaseTools/Source/C/Common/ParseInf.c @@ -506,7 +506,7 @@ Returns: Index =3D 0; =20 // - // Check input paramter + // Check input parameter // if (AsciiString =3D=3D NULL || ReturnValue =3D=3D NULL) { return EFI_INVALID_PARAMETER; diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom= /EfiRom.c index 7a57912..e2bd289 100644 --- a/BaseTools/Source/C/EfiRom/EfiRom.c +++ b/BaseTools/Source/C/EfiRom/EfiRom.c @@ -120,7 +120,7 @@ Returns: for (FList =3D mOptions.FileList; FList !=3D NULL; FList =3D FList->Next= ) { if (stricmp (mOptions.OutFileName, FList->FileName) =3D=3D 0) { Status =3D STATUS_ERROR; - Error (NULL, 0, 1002, "Invalid input paramter", "Input and output fi= le names must be different - %s =3D %s.", FList->FileName, mOptions.OutFile= Name); + Error (NULL, 0, 1002, "Invalid input parameter", "Input and=20 + output file names must be different - %s =3D %s.", FList->FileName,=20 + mOptions.OutFileName); goto BailOut; } } @@ -168,7 +168,7 @@ Returns: // Check total size // if (TotalSize > MAX_OPTION_ROM_SIZE) { - Error (NULL, 0, 2000, "Invalid paramter", "Option ROM image size excee= ds limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE); + Error (NULL, 0, 2000, "Invalid parameter", "Option ROM image size=20 + exceeds limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE); Status =3D STATUS_ERROR; } =20 diff --git a/BaseTools/Source/C/GenCrc32/GenCrc32.c b/BaseTools/Source/C/Ge= nCrc32/GenCrc32.c index ad8cf57..f4d129e 100644 --- a/BaseTools/Source/C/GenCrc32/GenCrc32.c +++ b/BaseTools/Source/C/GenCrc32/GenCrc32.c @@ -248,7 +248,7 @@ Returns: VerboseMsg ("%s tool start.", UTILITY_NAME); =20 // - // Check Input paramters + // Check Input parameters // if (FileAction =3D=3D CRC32_NULL) { Error (NULL, 0, 1001, "Missing option", "either the encode or the deco= de option must be specified!"); diff --git a/BaseTools/Source/C/GenFfs/GenF= fs.c b/BaseTools/Source/C/GenFfs/GenFfs.c index 433b608..9a738cb 100644 --- a/BaseTools/Source/C/GenFfs/GenFfs.c +++ b/BaseTools/Source/C/GenFfs/GenFfs.c @@ -739,7 +739,7 @@ Returns: VerboseMsg ("%s tool start.", UTILITY_NAME); =20 // - // Check the complete input paramters. + // Check the complete input parameters. // if (FfsFiletype =3D=3D EFI_FV_FILETYPE_ALL) { Error (NULL, 0, 1001, "Missing option", "filetype"); diff --git a/Base= Tools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/GenFw.c index 03bfaa1..b62756a 100644 --- a/BaseTools/Source/C/GenFw/GenFw.c +++ b/BaseTools/Source/C/GenFw/GenFw.c @@ -1093,7 +1093,7 @@ Returns: EFI_HII_PACKAGE_LIST_HEADER HiiPackageListHeader; EFI_HII_PACKAGE_HEADER HiiPackageHeader; EFI_IFR_FORM_SET IfrFormSet; - UINT8 NumberOfFormPacakge; + UINT8 NumberOfFormPackage; EFI_HII_PACKAGE_HEADER EndPackage; UINT32 HiiSectionHeaderSize; UINT8 *HiiSectionHeader; @@ -1140,7 +1140,7 @@ Returns: KeepExceptionTableFlag =3D FALSE; KeepOptionalHeaderFlag =3D FALSE; KeepZeroPendingFlag =3D FALSE; - NumberOfFormPacakge =3D 0; + NumberOfFormPackage =3D 0; HiiPackageListBuffer =3D NULL; HiiPackageDataPointer =3D NULL; EndPackage.Length =3D sizeof (EFI_HII_PACKAGE_HEADER); @@ -1642,7 +1642,7 @@ Returns: fread (&IfrFormSet, 1, sizeof (IfrFormSet), fpIn); memcpy (&HiiPackageListGuid, &IfrFormSet.Guid, sizeof (EFI_GUID)= ); } - NumberOfFormPacakge ++; + NumberOfFormPackage ++; } HiiPackageListHeader.PackageLength +=3D FileLength; fclose (fpIn); @@ -1651,7 +1651,7 @@ Returns: // // Check whether hii packages are valid // - if (NumberOfFormPacakge > 1) { + if (NumberOfFormPackage > 1) { Error (NULL, 0, 3000, "Invalid", "The input hii packages contains mo= re than one hii form package"); goto Finish; } diff --git a/BaseTools/Source/C/GenPage/GenPage.c b/BaseTools/Source/C/GenP= age/GenPage.c index fb829e6..ef69823 100644 --- a/BaseTools/Source/C/GenPage/GenPage.c +++ b/BaseTools/Source/C/GenPage/GenPage.c @@ -401,7 +401,7 @@ main ( } =20 // - // Don't recognize the paramter. + // Don't recognize the parameter. // InputFile =3D argv[0]; argc--; diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec= /GenSec.c index 20b2a10..d2bf102 100644 --- a/BaseTools/Source/C/GenSec/GenSec.c +++ b/BaseTools/Source/C/GenSec/GenSec.c @@ -267,10 +267,10 @@ Returns: STATUS Status; =20 if (InputFileNum > 1) { - Error (NULL, 0, 2000, "Invalid paramter", "more than one input file sp= ecified"); + Error (NULL, 0, 2000, "Invalid parameter", "more than one input=20 + file specified"); return STATUS_ERROR; } else if (InputFileNum < 1) { - Error (NULL, 0, 2000, "Invalid paramter", "no input file specified"); + Error (NULL, 0, 2000, "Invalid parameter", "no input file=20 + specified"); return STATUS_ERROR; } // @@ -296,7 +296,7 @@ Returns: // Size must fit in 3 bytes // //if (TotalLength >=3D MAX_SECTION_SIZE) { - // Error (NULL, 0, 2000, "Invalid paramter", "%s file size (0x%X) excee= ds section size limit(%uM).", InputFileName[0], (unsigned) TotalLength, MAX= _SECTION_SIZE>>20); + // Error (NULL, 0, 2000, "Invalid parameter", "%s file size (0x%X)=20 + exceeds section size limit(%uM).", InputFileName[0], (unsigned)=20 + TotalLength, MAX_SECTION_SIZE>>20); // goto Done; //} HeaderLength =3D sizeof (EFI_COMMON_SECTION_HEADER); @@ -436,12 +436,12 = @@ Returns: UINT32 HeaderSize; =20 if (InputFileNum < 1) { - Error (NULL, 0, 2000, "Invalid paramter", "must specify at least one i= nput file"); + Error (NULL, 0, 2000, "Invalid parameter", "must specify at least=20 + one input file"); return EFI_INVALID_PARAMETER; } =20 if (BufferLength =3D=3D NULL) { - Error (NULL, 0, 2000, "Invalid paramter", "BufferLength can't be NULL"= ); + Error (NULL, 0, 2000, "Invalid parameter", "BufferLength can't be=20 + NULL"); return EFI_INVALID_PARAMETER; } =20 @@ -698,7 +698,7 @@ Returns: break; =20 default: - Error (NULL, 0, 2000, "Invalid paramter", "unknown compression type"); + Error (NULL, 0, 2000, "Invalid parameter", "unknown compression=20 + type"); free (FileBuffer); return EFI_ABORTED; } @@ -737,7 +737,7 @@ Returns: "the original section size is %d bytes and the compressed sect= ion size is %u bytes", (unsigned) InputLength, (unsigned) CompressedLength)= ; =20 //if (TotalLength >=3D MAX_SECTION_SIZE) { - // Error (NULL, 0, 2000, "Invalid paramter", "The size of all files exc= eeds section size limit(%uM).", MAX_SECTION_SIZE>>20); + // Error (NULL, 0, 2000, "Invalid parameter", "The size of all files=20 + exceeds section size limit(%uM).", MAX_SECTION_SIZE>>20); // if (FileBuffer !=3D NULL) { // free (FileBuffer); // } diff --git a/BaseTools/Source/C/Split/Split.c b/BaseTools/Source/C/Split/Sp= lit.c index c6f547c..d723ed0 100644 --- a/BaseTools/Source/C/Split/Split.c +++ b/BaseTools/Source/C/Split/Split.c @@ -323,7 +323,7 @@ Returns: if (strlen(argv[0]) > 2) { Status =3D CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, &V= erboseLevel); if (EFI_ERROR (Status)) { - Error (NULL, 0, 0x1003, NULL, "%s is invaild paramter!", argv[0]= ); + Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!",=20 + argv[0]); return STATUS_ERROR; } } @@ -344,9 +344,9 @@ Returns: continue; } // - // Don't recognize the paramter. + // Don't recognize the parameter. // - Error (NULL, 0, 0x1003, NULL, "%s is invaild paramter!", argv[0]); + Error (NULL, 0, 0x1003, NULL, "%s is invaild parameter!", argv[0]); return STATUS_ERROR; } =20 diff --git a/BaseTools/Source/C/TianoCompress/TianoCompress.h b/BaseTools/S= ource/C/TianoCompress/TianoCompress.h index accbe2c..2971225 100644 --- a/BaseTools/Source/C/TianoCompress/TianoCompress.h +++ b/BaseTools/Source/C/TianoCompress/TianoCompress.h @@ -1,5 +1,5 @@ /** @file - Internal include file for Tiano Decompress Libary. + Internal include file for Tiano Decompress Library. =20 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
This program and the accompanying materials @@ -361,7 +361,7 @@ DecodeP = ( /** Reads code lengths for the Extra Set or the Position Set. =20 - Read in the Extra Set or Pointion Set Length Arrary, then + Read in the Extra Set or Position Set Length Array, then generate the Huffman code mapping for them. =20 @param Sd The global scratch data. diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c b/BaseTools/So= urce/C/VfrCompile/Pccts/dlg/dlg_p.c index e726ae3..af07c27 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c @@ -39,7 +39,7 @@ Fix for Borland C++ 4.x & 5.x compiling with ALL warnings= enabled #pragma warn -aus /* unused assignment of 'xxx' */ #endif =20 -int action_no =3D 0; /* keep track of actions outputed */ +int action_no =3D 0; /* keep track of actions outputted */ int nfa_allocated =3D 0; /* keeps track of number of nfa nodes */ nfa_node **nfa_array =3D NULL;/* root of binary tree that stores nfa array= */ nfa_node nfa_model_node; /* model to initialize new nodes */ -- 2.10.1