[edk2-devel] [Patch] UnitTestFrameworkPkg/UnitTestLib: Fix XCODE parenthesis issues

Michael D Kinney posted 1 patch 4 years, 2 months ago
Failed in applying to current master (apply log)
UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c | 6 +++---
UnitTestFrameworkPkg/Library/UnitTestLib/Log.c    | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
[edk2-devel] [Patch] UnitTestFrameworkPkg/UnitTestLib: Fix XCODE parenthesis issues
Posted by Michael D Kinney 4 years, 2 months ago
https://bugzilla.tianocore.org/show_bug.cgi?id=2512

Remove extra sets of parenthesis that generate warnings on XCODE5
builds.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c | 6 +++---
 UnitTestFrameworkPkg/Library/UnitTestLib/Log.c    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
index dd85b84b08..c327ba88f1 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
@@ -247,7 +247,7 @@ UnitTestAssertEqual (
   IN CONST CHAR8  *DescriptionB
   )
 {
-  if ((ValueA != ValueB)) {
+  if (ValueA != ValueB) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTEQUAL,
       "%a::%d Value %a != %a (%d != %d)!\n",
@@ -365,7 +365,7 @@ UnitTestAssertNotEqual (
   IN CONST CHAR8  *DescriptionB
   )
 {
-  if ((ValueA == ValueB)) {
+  if (ValueA == ValueB) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTNOTEQUAL,
       "%a::%d Value %a == %a (%d == %d)!\n",
@@ -420,7 +420,7 @@ UnitTestAssertStatusEqual (
   IN CONST CHAR8  *Description
   )
 {
-  if ((Status != Expected)) {
+  if (Status != Expected) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTSTATUSEQUAL,
       "%a::%d Status '%a' is %r, should be %r!\n",
diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
index 78df086a28..ac4e229b40 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
@@ -136,7 +136,7 @@ UnitTestLogInit (
     return;
   }
 
-  if((Buffer != NULL) && (BufferSize > 0) && ((BufferSize <= UNIT_TEST_MAX_LOG_BUFFER))) {
+  if((Buffer != NULL) && (BufferSize > 0) && (BufferSize <= UNIT_TEST_MAX_LOG_BUFFER)) {
     CopyMem (Test->Log, Buffer, BufferSize);
   }
 }
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54157): https://edk2.groups.io/g/devel/message/54157
Mute This Topic: https://groups.io/mt/71145488/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch] UnitTestFrameworkPkg/UnitTestLib: Fix XCODE parenthesis issues
Posted by Sean via Groups.Io 4 years, 2 months ago
Reviewed by: Sean Brogan <sean.brogan@microsoft.com>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54158): https://edk2.groups.io/g/devel/message/54158
Mute This Topic: https://groups.io/mt/71145488/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [EXTERNAL] [Patch] UnitTestFrameworkPkg/UnitTestLib: Fix XCODE parenthesis issues
Posted by Bret Barkelew via Groups.Io 4 years, 2 months ago
Reviewed-by: Bret Barkelew <bret.barkelew@microsoft.com>

- Bret

________________________________
From: Michael D Kinney <michael.d.kinney@intel.com>
Sent: Monday, February 10, 2020 10:43:32 AM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [EXTERNAL] [Patch] UnitTestFrameworkPkg/UnitTestLib: Fix XCODE parenthesis issues

https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D2512&amp;data=02%7C01%7CBret.Barkelew%40microsoft.com%7C27b6bd3a84b64d456eec08d7ae5922fa%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637169570173423344&amp;sdata=%2BfnZ0QzM%2Fu1zVdS69ZUyxIkngUjdvpZo8I93SKLqeh8%3D&amp;reserved=0

Remove extra sets of parenthesis that generate warnings on XCODE5
builds.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c | 6 +++---
 UnitTestFrameworkPkg/Library/UnitTestLib/Log.c    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
index dd85b84b08..c327ba88f1 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c
@@ -247,7 +247,7 @@ UnitTestAssertEqual (
   IN CONST CHAR8  *DescriptionB
   )
 {
-  if ((ValueA != ValueB)) {
+  if (ValueA != ValueB) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTEQUAL,
       "%a::%d Value %a != %a (%d != %d)!\n",
@@ -365,7 +365,7 @@ UnitTestAssertNotEqual (
   IN CONST CHAR8  *DescriptionB
   )
 {
-  if ((ValueA == ValueB)) {
+  if (ValueA == ValueB) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTNOTEQUAL,
       "%a::%d Value %a == %a (%d == %d)!\n",
@@ -420,7 +420,7 @@ UnitTestAssertStatusEqual (
   IN CONST CHAR8  *Description
   )
 {
-  if ((Status != Expected)) {
+  if (Status != Expected) {
     UnitTestLogFailure (
       FAILURETYPE_ASSERTSTATUSEQUAL,
       "%a::%d Status '%a' is %r, should be %r!\n",
diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c b/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
index 78df086a28..ac4e229b40 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/Log.c
@@ -136,7 +136,7 @@ UnitTestLogInit (
     return;
   }

-  if((Buffer != NULL) && (BufferSize > 0) && ((BufferSize <= UNIT_TEST_MAX_LOG_BUFFER))) {
+  if((Buffer != NULL) && (BufferSize > 0) && (BufferSize <= UNIT_TEST_MAX_LOG_BUFFER)) {
     CopyMem (Test->Log, Buffer, BufferSize);
   }
 }
--
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54660): https://edk2.groups.io/g/devel/message/54660
Mute This Topic: https://groups.io/mt/71412829/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-