[edk2-devel] [PATCH v1 02/25] ArmPkg: Fix Ecc error 3002 in CompilerIntrinsicsLib
PierreGondois
pierre.gondois at arm.com
Wed Dec 16 17:21:37 UTC 2020
From: Pierre Gondois <Pierre.Gondois at arm.com>
This patch fixes the following Ecc reported error:
Non-Boolean comparisons should use a compare operator
(==, !=, >, < >=, <=)
Brackets are also added to comply to with the coding
standard.
Signed-off-by: Pierre Gondois <Pierre.Gondois at arm.com>
---
The changes can be seen at: https://github.com/PierreARM/edk2/commits/1552_Ecc_ArmPkg_v1
ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c | 3 ++-
ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c | 4 +++-
ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c | 4 +++-
ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c | 7 +++++--
ArmPkg/Library/CompilerIntrinsicsLib/memset.c | 4 +++-
ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c | 4 +++-
6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
index 551f8e77c12f..8491e2401f1e 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2019, Pete Batard. All rights reserved.
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -20,7 +21,7 @@ int memcmp(const void *s1, const void *s2, size_t n)
unsigned char const *t1 = s1;
unsigned char const *t2 = s2;
- while (n--) {
+ while (n-- != 0) {
if (*t1 != *t2)
return (int)*t1 - (int)*t2;
t1++;
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
index 6e9c85f4bafd..d4827531dd04 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -13,8 +14,9 @@ static void __memcpy(void *dest, const void *src, size_t n)
unsigned char *d = dest;
unsigned char const *s = src;
- while (n--)
+ while (n-- != 0) {
*d++ = *s++;
+ }
}
void *memcpy(void *dest, const void *src, size_t n)
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
index 34feef5a4bb9..a9590df68054 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2017, Pete Batard. All rights reserved.<BR>
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -20,8 +21,9 @@ void* memcpy(void *dest, const void *src, size_t n)
unsigned char *d = dest;
unsigned char const *s = src;
- while (n--)
+ while (n-- != 0) {
*d++ = *s++;
+ }
return dest;
}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
index 5b261ef8b948..a2e1ef9c8883 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2019, Pete Batard. All rights reserved.
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -21,13 +22,15 @@ void* memmove(void *dest, const void *src, size_t n)
unsigned char const *s = src;
if (d < s) {
- while (n--)
+ while (n-- != 0) {
*d++ = *s++;
+ }
} else {
d += n;
s += n;
- while (n--)
+ while (n-- != 0) {
*--d = *--s;
+ }
}
return dest;
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
index 24398d591f79..57fc776333b0 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -13,8 +14,9 @@ void *__memset(void *s, int c, size_t n)
{
unsigned char *d = s;
- while (n--)
+ while (n-- != 0) {
*d++ = c;
+ }
return s;
}
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
index 4de55d845718..463fc21d3184 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------
//
// Copyright (c) 2017, Pete Batard. All rights reserved.<BR>
+// Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
//
// SPDX-License-Identifier: BSD-2-Clause-Patent
//
@@ -19,8 +20,9 @@ void *memset(void *s, int c, size_t n)
{
unsigned char *d = s;
- while (n--)
+ while (n-- != 0) {
*d++ = (unsigned char)c;
+ }
return s;
}
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68985): https://edk2.groups.io/g/devel/message/68985
Mute This Topic: https://groups.io/mt/79006181/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list