[PATCH v2 02/17] BaseTools: Remove duplicated words


PierreGondois
 

Hello Bob,
Thanks for the review. Other patches in the serie received a Reviewed-by:
- [PATCH v2 04/17] DynamicTablesPkg: Remove duplicated words
- [PATCH v2 09/17] NetworkPkg: Remove duplicated words
- [PATCH v2 11/17] RedfishPkg: Remove duplicated words
- [PATCH v2 13/17] ShellPkg: Remove duplicated words
- [PATCH v2 14/17] SourceLevelDebugPkg: Remove duplicated words
- [PATCH v2 17/17] UnitTestFrameworkPkg: Remove duplicated words

Would it be possible to take them aswell ? I'm not sure who should take them as
they are accross multiple packages,

Regards,
Pierre

On 10/1/22 17:08, Feng, Bob C wrote:
Reviewed-by: Bob Feng <bob.c.feng@...>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@...>; Feng, Bob C <bob.c.feng@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
From: Pierre Gondois <pierre.gondois@...>
In an effort to clean the documentation of the above package, remove duplicated words.
Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Signed-off-by: Pierre Gondois <pierre.gondois@...>
---
BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 6 +++---
BaseTools/Source/C/DevicePath/DevicePathUtilities.c | 2 +-
BaseTools/Source/C/GenFv/GenFv.c | 2 +-
BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c | 4 ++--
BaseTools/Source/Python/Ecc/EccToolError.py | 2 +-
BaseTools/Source/Python/build/build.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
index 70741c8afcb5..ace26eb71c6b 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -91,7 +91,7 @@ Routine Description:
Arguments:
- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
@@ -141,7 +141,7 @@ Routine Description:
Arguments:
- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
@@ -285,7 +285,7 @@ Routine Description:
Arguments:
- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
diff --git a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
index 2ffefa8ceeef..49078aac8caf 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
@@ -37,7 +37,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLibEndDevicePath = {
@retval TRUE DevicePath is valid.
@retval FALSE DevicePath is NULL.
@retval FALSE Maxsize is less than sizeof(EFI_DEVICE_PATH_PROTOCOL).
- @retval FALSE The length of any node node in the DevicePath is less
+ @retval FALSE The length of any node in the DevicePath is less
than sizeof (EFI_DEVICE_PATH_PROTOCOL).
@retval FALSE If MaxSize is not zero, the size of the DevicePath
exceeds MaxSize.
diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
index 43cc5cd3fe82..a742d55e5270 100644
--- a/BaseTools/Source/C/GenFv/GenFv.c
+++ b/BaseTools/Source/C/GenFv/GenFv.c
@@ -299,7 +299,7 @@ Returns:
return STATUS_ERROR;
}
if (TempNumber == 0) {
- Error (NULL, 0, 1003, "Invalid option value", "Fv block size can't be be set to zero");
+ Error (NULL, 0, 1003, "Invalid option value", "Fv block size
+ can't be set to zero");
return STATUS_ERROR;
}
mFvDataInfo.FvBlocks[0].Length = (UINT32) TempNumber; diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
index b57f5ded846c..bf3dd18eaf6f 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
@@ -714,7 +714,7 @@ Tree *MR_compute_pred_tree_ctxXX(p)
if (p == NULL) return NULL;
/* this appears strange: why do we OR the context
- of and AND predicate ? It is because of the way
+ of an AND predicate ? It is because of the way
that predicates are evaluated: if the context is
wrong then it's the same as if the predicate was
true. That means that even when one leg of an @@ -1531,7 +1531,7 @@ Predicate * MR_find_in_aSubBlk(alt)
* 1. if lookahead for alt i is contained in the lookahead for any
* alt j then ignore semantic predicate of alt i
* 2. if lookahead for alt i is not contained in the lookahead for
- * any alt j then add add predicate i to the OR list to be hoisted
+ * any alt j then add predicate i to the OR list to be hoisted
* 3. if lookahead for alt i overlaps the lookahead for some alt j then
* add a dummy semantic predicate for alt j
*
diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Source/Python/Ecc/EccToolError.py
index d97bf7948ce8..2ff36c8329cc 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -186,7 +186,7 @@ gEccErrorMessage = {
ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is specified in the FDF file, but not in the DSC file, therefore the INF file must be for a Binary module only",
ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",
ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file should only be related to flash",
- ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs declared in INF files that are not specified in in either a DSC or FDF file",
+ ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs
+ declared in INF files that are not specified in either a DSC or FDF
+ file",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_GUID : "Duplicate GUID found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PROTOCOL : "Duplicate PROTOCOL found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI : "Duplicate PPI found", diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 07187c03618a..51fb1f433eb7 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -205,7 +205,7 @@ class MakeSubProc(Popen):
#
# This method will call subprocess.Popen to execute an external program with # given options in specified directory. Because of the dead-lock issue during -# redirecting output of the external program, threads are used to to do the
+# redirecting output of the external program, threads are used to do
+the
# redirection work.
#
# @param Command A list or string containing the call of the program
--
2.25.1
-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93193): https://edk2.groups.io/g/devel/message/93193
Mute This Topic: https://groups.io/mt/93496599/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@...]
-=-=-=-=-=-=


Bob Feng
 

Hi Pierre,

Could you split this patch into 2? One is for basetools C tool, the other is for python tool because the python code patch will be merged to edk2-basetools repo also.

Thanks,
Bob

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Bob Feng
Sent: Saturday, October 1, 2022 11:08 PM
To: devel@edk2.groups.io; pierre.gondois@...
Cc: Gao, Liming <gaoliming@...>
Subject: Re: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words

Reviewed-by: Bob Feng <bob.c.feng@...>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@...>; Feng, Bob C <bob.c.feng@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words

From: Pierre Gondois <pierre.gondois@...>

In an effort to clean the documentation of the above package, remove duplicated words.

Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Signed-off-by: Pierre Gondois <pierre.gondois@...>
---
BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 6 +++---
BaseTools/Source/C/DevicePath/DevicePathUtilities.c | 2 +-
BaseTools/Source/C/GenFv/GenFv.c | 2 +-
BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c | 4 ++--
BaseTools/Source/Python/Ecc/EccToolError.py | 2 +-
BaseTools/Source/Python/build/build.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
index 70741c8afcb5..ace26eb71c6b 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -91,7 +91,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

@@ -141,7 +141,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

@@ -285,7 +285,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

diff --git a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
index 2ffefa8ceeef..49078aac8caf 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
@@ -37,7 +37,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLibEndDevicePath = {
@retval TRUE DevicePath is valid.
@retval FALSE DevicePath is NULL.
@retval FALSE Maxsize is less than sizeof(EFI_DEVICE_PATH_PROTOCOL).
- @retval FALSE The length of any node node in the DevicePath is less
+ @retval FALSE The length of any node in the DevicePath is less
than sizeof (EFI_DEVICE_PATH_PROTOCOL).
@retval FALSE If MaxSize is not zero, the size of the DevicePath
exceeds MaxSize.
diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
index 43cc5cd3fe82..a742d55e5270 100644
--- a/BaseTools/Source/C/GenFv/GenFv.c
+++ b/BaseTools/Source/C/GenFv/GenFv.c
@@ -299,7 +299,7 @@ Returns:
return STATUS_ERROR;
}
if (TempNumber == 0) {
- Error (NULL, 0, 1003, "Invalid option value", "Fv block size can't be be set to zero");
+ Error (NULL, 0, 1003, "Invalid option value", "Fv block size
+ can't be set to zero");
return STATUS_ERROR;
}
mFvDataInfo.FvBlocks[0].Length = (UINT32) TempNumber; diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
index b57f5ded846c..bf3dd18eaf6f 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
@@ -714,7 +714,7 @@ Tree *MR_compute_pred_tree_ctxXX(p)
if (p == NULL) return NULL;

/* this appears strange: why do we OR the context
- of and AND predicate ? It is because of the way
+ of an AND predicate ? It is because of the way
that predicates are evaluated: if the context is
wrong then it's the same as if the predicate was
true. That means that even when one leg of an @@ -1531,7 +1531,7 @@ Predicate * MR_find_in_aSubBlk(alt)
* 1. if lookahead for alt i is contained in the lookahead for any
* alt j then ignore semantic predicate of alt i
* 2. if lookahead for alt i is not contained in the lookahead for
- * any alt j then add add predicate i to the OR list to be hoisted
+ * any alt j then add predicate i to the OR list to be hoisted
* 3. if lookahead for alt i overlaps the lookahead for some alt j then
* add a dummy semantic predicate for alt j
*
diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Source/Python/Ecc/EccToolError.py
index d97bf7948ce8..2ff36c8329cc 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -186,7 +186,7 @@ gEccErrorMessage = {
ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is specified in the FDF file, but not in the DSC file, therefore the INF file must be for a Binary module only",
ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",
ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file should only be related to flash",
- ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs declared in INF files that are not specified in in either a DSC or FDF file",
+ ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs
+ declared in INF files that are not specified in either a DSC or FDF
+ file",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_GUID : "Duplicate GUID found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PROTOCOL : "Duplicate PROTOCOL found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI : "Duplicate PPI found", diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 07187c03618a..51fb1f433eb7 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -205,7 +205,7 @@ class MakeSubProc(Popen):
#
# This method will call subprocess.Popen to execute an external program with # given options in specified directory. Because of the dead-lock issue during -# redirecting output of the external program, threads are used to to do the
+# redirecting output of the external program, threads are used to do
+the
# redirection work.
#
# @param Command A list or string containing the call of the program
--
2.25.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93193): https://edk2.groups.io/g/devel/message/93193
Mute This Topic: https://groups.io/mt/93496599/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@...] -=-=-=-=-=-=


Bob Feng
 

Reviewed-by: Bob Feng <bob.c.feng@...>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@...>; Feng, Bob C <bob.c.feng@...>; Gao, Liming <gaoliming@...>
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words

From: Pierre Gondois <pierre.gondois@...>

In an effort to clean the documentation of the above package, remove duplicated words.

Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Signed-off-by: Pierre Gondois <pierre.gondois@...>
---
BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 6 +++---
BaseTools/Source/C/DevicePath/DevicePathUtilities.c | 2 +-
BaseTools/Source/C/GenFv/GenFv.c | 2 +-
BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c | 4 ++--
BaseTools/Source/Python/Ecc/EccToolError.py | 2 +-
BaseTools/Source/Python/build/build.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
index 70741c8afcb5..ace26eb71c6b 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -91,7 +91,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

@@ -141,7 +141,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

@@ -285,7 +285,7 @@ Routine Description:

Arguments:

- SourceFv - Address of the Fv in memory, this firmware volume volume will
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace

diff --git a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
index 2ffefa8ceeef..49078aac8caf 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
@@ -37,7 +37,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLibEndDevicePath = {
@retval TRUE DevicePath is valid.
@retval FALSE DevicePath is NULL.
@retval FALSE Maxsize is less than sizeof(EFI_DEVICE_PATH_PROTOCOL).
- @retval FALSE The length of any node node in the DevicePath is less
+ @retval FALSE The length of any node in the DevicePath is less
than sizeof (EFI_DEVICE_PATH_PROTOCOL).
@retval FALSE If MaxSize is not zero, the size of the DevicePath
exceeds MaxSize.
diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/GenFv.c
index 43cc5cd3fe82..a742d55e5270 100644
--- a/BaseTools/Source/C/GenFv/GenFv.c
+++ b/BaseTools/Source/C/GenFv/GenFv.c
@@ -299,7 +299,7 @@ Returns:
return STATUS_ERROR;
}
if (TempNumber == 0) {
- Error (NULL, 0, 1003, "Invalid option value", "Fv block size can't be be set to zero");
+ Error (NULL, 0, 1003, "Invalid option value", "Fv block size
+ can't be set to zero");
return STATUS_ERROR;
}
mFvDataInfo.FvBlocks[0].Length = (UINT32) TempNumber; diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
index b57f5ded846c..bf3dd18eaf6f 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
@@ -714,7 +714,7 @@ Tree *MR_compute_pred_tree_ctxXX(p)
if (p == NULL) return NULL;

/* this appears strange: why do we OR the context
- of and AND predicate ? It is because of the way
+ of an AND predicate ? It is because of the way
that predicates are evaluated: if the context is
wrong then it's the same as if the predicate was
true. That means that even when one leg of an @@ -1531,7 +1531,7 @@ Predicate * MR_find_in_aSubBlk(alt)
* 1. if lookahead for alt i is contained in the lookahead for any
* alt j then ignore semantic predicate of alt i
* 2. if lookahead for alt i is not contained in the lookahead for
- * any alt j then add add predicate i to the OR list to be hoisted
+ * any alt j then add predicate i to the OR list to be hoisted
* 3. if lookahead for alt i overlaps the lookahead for some alt j then
* add a dummy semantic predicate for alt j
*
diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Source/Python/Ecc/EccToolError.py
index d97bf7948ce8..2ff36c8329cc 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -186,7 +186,7 @@ gEccErrorMessage = {
ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is specified in the FDF file, but not in the DSC file, therefore the INF file must be for a Binary module only",
ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",
ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file should only be related to flash",
- ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs declared in INF files that are not specified in in either a DSC or FDF file",
+ ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs
+ declared in INF files that are not specified in either a DSC or FDF
+ file",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_GUID : "Duplicate GUID found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PROTOCOL : "Duplicate PROTOCOL found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI : "Duplicate PPI found", diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 07187c03618a..51fb1f433eb7 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -205,7 +205,7 @@ class MakeSubProc(Popen):
#
# This method will call subprocess.Popen to execute an external program with # given options in specified directory. Because of the dead-lock issue during -# redirecting output of the external program, threads are used to to do the
+# redirecting output of the external program, threads are used to do
+the
# redirection work.
#
# @param Command A list or string containing the call of the program
--
2.25.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93193): https://edk2.groups.io/g/devel/message/93193
Mute This Topic: https://groups.io/mt/93496599/1768742
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@...]
-=-=-=-=-=-=


PierreGondois
 

From: Pierre Gondois <pierre.gondois@...>

In an effort to clean the documentation of the above
package, remove duplicated words.

Cc: Bob Feng <bob.c.feng@...>
Cc: Liming Gao <gaoliming@...>
Signed-off-by: Pierre Gondois <pierre.gondois@...>
---
BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 6 +++---
BaseTools/Source/C/DevicePath/DevicePathUtilities.c | 2 +-
BaseTools/Source/C/GenFv/GenFv.c | 2 +-
BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c | 4 ++--
BaseTools/Source/Python/Ecc/EccToolError.py | 2 +-
BaseTools/Source/Python/build/build.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c b/BaseTools=
/Source/C/Common/FirmwareVolumeBuffer.c
index 70741c8afcb5..ace26eb71c6b 100644
--- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c
@@ -91,7 +91,7 @@ Routine Description:
=20
Arguments:
=20
- SourceFv - Address of the Fv in memory, this firmware volume volume wi=
ll
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
=20
@@ -141,7 +141,7 @@ Routine Description:
=20
Arguments:
=20
- SourceFv - Address of the Fv in memory, this firmware volume volume wi=
ll
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
=20
@@ -285,7 +285,7 @@ Routine Description:
=20
Arguments:
=20
- SourceFv - Address of the Fv in memory, this firmware volume volume wi=
ll
+ SourceFv - Address of the Fv in memory, this firmware volume will
be modified, if SourceFfsFile exists
SourceFfsFile - Input FFS file to replace
=20
diff --git a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c b/BaseTo=
ols/Source/C/DevicePath/DevicePathUtilities.c
index 2ffefa8ceeef..49078aac8caf 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
@@ -37,7 +37,7 @@ CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLibEndDe=
vicePath =3D {
@retval TRUE DevicePath is valid.
@retval FALSE DevicePath is NULL.
@retval FALSE Maxsize is less than sizeof(EFI_DEVICE_PATH_PROTOC=
OL).
- @retval FALSE The length of any node node in the DevicePath is l=
ess
+ @retval FALSE The length of any node in the DevicePath is less
than sizeof (EFI_DEVICE_PATH_PROTOCOL).
@retval FALSE If MaxSize is not zero, the size of the DevicePath
exceeds MaxSize.
diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/=
GenFv.c
index 43cc5cd3fe82..a742d55e5270 100644
--- a/BaseTools/Source/C/GenFv/GenFv.c
+++ b/BaseTools/Source/C/GenFv/GenFv.c
@@ -299,7 +299,7 @@ Returns:
return STATUS_ERROR;
}
if (TempNumber =3D=3D 0) {
- Error (NULL, 0, 1003, "Invalid option value", "Fv block size can=
't be be set to zero");
+ Error (NULL, 0, 1003, "Invalid option value", "Fv block size can=
't be set to zero");
return STATUS_ERROR;
}
mFvDataInfo.FvBlocks[0].Length =3D (UINT32) TempNumber;
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c b/BaseTo=
ols/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
index b57f5ded846c..bf3dd18eaf6f 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
@@ -714,7 +714,7 @@ Tree *MR_compute_pred_tree_ctxXX(p)
if (p =3D=3D NULL) return NULL;
=20
/* this appears strange: why do we OR the context
- of and AND predicate ? It is because of the way
+ of an AND predicate ? It is because of the way
that predicates are evaluated: if the context is
wrong then it's the same as if the predicate was
true. That means that even when one leg of an
@@ -1531,7 +1531,7 @@ Predicate * MR_find_in_aSubBlk(alt)
* 1. if lookahead for alt i is contained in the lookahead for any
* alt j then ignore semantic predicate of alt i
* 2. if lookahead for alt i is not contained in the lookahead for
- * any alt j then add add predicate i to the OR list to be hois=
ted
+ * any alt j then add predicate i to the OR list to be hoisted
* 3. if lookahead for alt i overlaps the lookahead for some alt j=
then
* add a dummy semantic predicate for alt j
*
diff --git a/BaseTools/Source/Python/Ecc/EccToolError.py b/BaseTools/Sour=
ce/Python/Ecc/EccToolError.py
index d97bf7948ce8..2ff36c8329cc 100644
--- a/BaseTools/Source/Python/Ecc/EccToolError.py
+++ b/BaseTools/Source/Python/Ecc/EccToolError.py
@@ -186,7 +186,7 @@ gEccErrorMessage =3D {
ERROR_META_DATA_FILE_CHECK_BINARY_INF_IN_FDF : "An INF file is speci=
fied in the FDF file, but not in the DSC file, therefore the INF file mus=
t be for a Binary module only",
ERROR_META_DATA_FILE_CHECK_PCD_DUPLICATE : "Duplicate PCDs found",
ERROR_META_DATA_FILE_CHECK_PCD_FLASH : "PCD settings in the FDF file=
should only be related to flash",
- ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs dec=
lared in INF files that are not specified in in either a DSC or FDF file"=
,
+ ERROR_META_DATA_FILE_CHECK_PCD_NO_USE : "There should be no PCDs dec=
lared in INF files that are not specified in either a DSC or FDF file",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_GUID : "Duplicate GUID found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PROTOCOL : "Duplicate PROTOCOL =
found",
ERROR_META_DATA_FILE_CHECK_DUPLICATE_PPI : "Duplicate PPI found",
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Py=
thon/build/build.py
index 07187c03618a..51fb1f433eb7 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -205,7 +205,7 @@ class MakeSubProc(Popen):
#
# This method will call subprocess.Popen to execute an external program =
with
# given options in specified directory. Because of the dead-lock issue d=
uring
-# redirecting output of the external program, threads are used to to do =
the
+# redirecting output of the external program, threads are used to do the
# redirection work.
#
# @param Command A list or string containing the call of =
the program
--=20
2.25.1