Reviewed-by: Liming Gao <[email protected]> > -----Original Message----- > From: Gary Lin [mailto:[email protected]] > Sent: Wednesday, October 19, 2016 3:01 PM > To: [email protected] > Cc: Zhu, Yonghong <[email protected]>; Gao, Liming > <[email protected]> > 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 <[email protected]> > Cc: Liming Gao <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin <[email protected]> > --- > 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/Source/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/Common/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: > > Returns: > > - EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successull retrieved. > + EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successfully retrieved. > EFI_INVALID_PARAMETER - The source data is corrupted > > --*/ > @@ -810,7 +810,7 @@ Arguments: > > Returns: > > - EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successull retrieved. > + EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successfully retrieved. > EFI_INVALID_PARAMETER - The source data is corrupted > > --*/ > @@ -840,7 +840,7 @@ Arguments: > > Returns: > > - EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successull retrieved. > + EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successfully retrieved. > EFI_INVALID_PARAMETER - The source data is corrupted > > --*/ > diff --git a/BaseTools/Source/C/Common/Decompress.h > b/BaseTools/Source/C/Common/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: > > Returns: > > - EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successull retrieved. > + EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successfully retrieved. > EFI_INVALID_PARAMETER - The source data is corrupted > > **/ > @@ -97,7 +97,7 @@ Arguments: > > Returns: > > - EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successull retrieved. > + EFI_SUCCESS - The size of destination buffer and the size of > scratch > buffer are successfully retrieved. > EFI_INVALID_PARAMETER - The source data is corrupted > > **/ > diff --git a/BaseTools/Source/C/Common/ParseInf.c > b/BaseTools/Source/C/Common/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 = 0; > > // > - // Check input paramter > + // Check input parameter > // > if (AsciiString == NULL || ReturnValue == 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 = mOptions.FileList; FList != NULL; FList = FList->Next) { > if (stricmp (mOptions.OutFileName, FList->FileName) == 0) { > Status = STATUS_ERROR; > - Error (NULL, 0, 1002, "Invalid input paramter", "Input and output file > names must be different - %s = %s.", FList->FileName, > mOptions.OutFileName); > + Error (NULL, 0, 1002, "Invalid input parameter", "Input and output file > names must be different - %s = %s.", FList->FileName, > 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 exceeds > limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE); > + Error (NULL, 0, 2000, "Invalid parameter", "Option ROM image size > exceeds limit of 0x%X bytes.", MAX_OPTION_ROM_SIZE); > Status = STATUS_ERROR; > } > > diff --git a/BaseTools/Source/C/GenCrc32/GenCrc32.c > b/BaseTools/Source/C/GenCrc32/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); > > // > - // Check Input paramters > + // Check Input parameters > // > if (FileAction == CRC32_NULL) { > Error (NULL, 0, 1001, "Missing option", "either the encode or the decode > option must be specified!"); > diff --git a/BaseTools/Source/C/GenFfs/GenFfs.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); > > // > - // Check the complete input paramters. > + // Check the complete input parameters. > // > if (FfsFiletype == EFI_FV_FILETYPE_ALL) { > Error (NULL, 0, 1001, "Missing option", "filetype"); > diff --git a/BaseTools/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 = FALSE; > KeepOptionalHeaderFlag = FALSE; > KeepZeroPendingFlag = FALSE; > - NumberOfFormPacakge = 0; > + NumberOfFormPackage = 0; > HiiPackageListBuffer = NULL; > HiiPackageDataPointer = NULL; > EndPackage.Length = 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 += 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 more > than > one hii form package"); > goto Finish; > } > diff --git a/BaseTools/Source/C/GenPage/GenPage.c > b/BaseTools/Source/C/GenPage/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 ( > } > > // > - // Don't recognize the paramter. > + // Don't recognize the parameter. > // > InputFile = 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; > > if (InputFileNum > 1) { > - Error (NULL, 0, 2000, "Invalid paramter", "more than one input file > specified"); > + Error (NULL, 0, 2000, "Invalid parameter", "more than one input 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 specified"); > return STATUS_ERROR; > } > // > @@ -296,7 +296,7 @@ Returns: > // Size must fit in 3 bytes > // > //if (TotalLength >= MAX_SECTION_SIZE) { > - // Error (NULL, 0, 2000, "Invalid paramter", "%s file size (0x%X) exceeds > section size limit(%uM).", InputFileName[0], (unsigned) TotalLength, > MAX_SECTION_SIZE>>20); > + // Error (NULL, 0, 2000, "Invalid parameter", "%s file size (0x%X) exceeds > section size limit(%uM).", InputFileName[0], (unsigned) TotalLength, > MAX_SECTION_SIZE>>20); > // goto Done; > //} > HeaderLength = sizeof (EFI_COMMON_SECTION_HEADER); > @@ -436,12 +436,12 @@ Returns: > UINT32 HeaderSize; > > if (InputFileNum < 1) { > - Error (NULL, 0, 2000, "Invalid paramter", "must specify at least one > input > file"); > + Error (NULL, 0, 2000, "Invalid parameter", "must specify at least one > input > file"); > return EFI_INVALID_PARAMETER; > } > > if (BufferLength == NULL) { > - Error (NULL, 0, 2000, "Invalid paramter", "BufferLength can't be NULL"); > + Error (NULL, 0, 2000, "Invalid parameter", "BufferLength can't be NULL"); > return EFI_INVALID_PARAMETER; > } > > @@ -698,7 +698,7 @@ Returns: > break; > > default: > - Error (NULL, 0, 2000, "Invalid paramter", "unknown compression type"); > + Error (NULL, 0, 2000, "Invalid parameter", "unknown compression type"); > free (FileBuffer); > return EFI_ABORTED; > } > @@ -737,7 +737,7 @@ Returns: > "the original section size is %d bytes and the compressed > section size > is %u bytes", (unsigned) InputLength, (unsigned) CompressedLength); > > //if (TotalLength >= MAX_SECTION_SIZE) { > - // Error (NULL, 0, 2000, "Invalid paramter", "The size of all files > exceeds > section size limit(%uM).", MAX_SECTION_SIZE>>20); > + // Error (NULL, 0, 2000, "Invalid parameter", "The size of all files > exceeds > section size limit(%uM).", MAX_SECTION_SIZE>>20); > // if (FileBuffer != NULL) { > // free (FileBuffer); > // } > diff --git a/BaseTools/Source/C/Split/Split.c > b/BaseTools/Source/C/Split/Split.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 = CountVerboseLevel (&argv[0][2], strlen(argv[0]) - 2, > &VerboseLevel); > if (EFI_ERROR (Status)) { > - 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; > } > } > @@ -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; > } > > diff --git a/BaseTools/Source/C/TianoCompress/TianoCompress.h > b/BaseTools/Source/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. > > Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials > @@ -361,7 +361,7 @@ DecodeP ( > /** > Reads code lengths for the Extra Set or the Position Set. > > - 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. > > @param Sd The global scratch data. > diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c > b/BaseTools/Source/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 > > -int action_no = 0; /* keep track of actions outputed */ > +int action_no = 0; /* keep track of actions outputted */ > int nfa_allocated = 0; /* keeps track of number of nfa nodes */ > nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */ > nfa_node nfa_model_node; /* model to initialize new nodes */ > -- > 2.10.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
