Re: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
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
-Original Message-
From: devel@edk2.groups.io On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois ; Feng, Bob C ; Gao,
Liming
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
From: Pierre Gondois
In an effort to clean the documentation of the above package, remove duplicated
words.
Cc: Bob Feng
Cc: Liming Gao
Signed-off-by: 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 TRUEDevicePath 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
Re: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
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 On Behalf Of Bob Feng
Sent: Saturday, October 1, 2022 11:08 PM
To: devel@edk2.groups.io; pierre.gond...@arm.com
Cc: Gao, Liming
Subject: Re: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
Reviewed-by: Bob Feng
-Original Message-
From: devel@edk2.groups.io On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois ; Feng, Bob C
; Gao, Liming
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
From: Pierre Gondois
In an effort to clean the documentation of the above package, remove duplicated
words.
Cc: Bob Feng
Cc: Liming Gao
Signed-off-by: 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 TRUEDevicePath 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 th
Re: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
Reviewed-by: Bob Feng
-Original Message-
From: devel@edk2.groups.io On Behalf Of PierreGondois
Sent: Tuesday, September 6, 2022 4:29 PM
To: devel@edk2.groups.io
Cc: Pierre Gondois ; Feng, Bob C
; Gao, Liming
Subject: [edk2-devel] [PATCH v2 02/17] BaseTools: Remove duplicated words
From: Pierre Gondois
In an effort to clean the documentation of the above package, remove duplicated
words.
Cc: Bob Feng
Cc: Liming Gao
Signed-off-by: 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 TRUEDevicePath 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 @@
