Fix check_[uptr/u32]_overflow() macros MISRA defects

Add missing parentheses to fix MISRA C-2012 Rule 12.1.

Also, the result of a comparison is an essentially boolean value, it
isn't needed to return 1 or 0 depending on it.

Also, fix header guards (MISRA C-2012 Rule 21.1).

Change-Id: I90c0bcdeb2787c1ca659fc9a981808ece7958de3
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h
index 6bc97065cbe1f51f9ecfc2230ec9e7a2f8e8dce3..5b4fd7808fc94a5f023af839ce51dc42adca70f7 100644 (file)
--- a/include/lib/utils_def.h
+++ b/include/lib/utils_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __UTILS_DEF_H__
-#define __UTILS_DEF_H__
+#ifndef UTILS_DEF_H
+#define UTILS_DEF_H
 
 /* Compute the number of elements in the given array */
 #define ARRAY_SIZE(a)                          \
@@ -88,15 +88,15 @@
  * Evaluates to 1 if (ptr + inc) overflows, 0 otherwise.
  * Both arguments must be unsigned pointer values (i.e. uintptr_t).
  */
-#define check_uptr_overflow(ptr, inc)          \
-       (((ptr) > UINTPTR_MAX - (inc)) ? 1 : 0)
+#define check_uptr_overflow(_ptr, _inc)                \
+       ((_ptr) > (UINTPTR_MAX - (_inc)))
 
 /*
  * Evaluates to 1 if (u32 + inc) overflows, 0 otherwise.
  * Both arguments must be 32-bit unsigned integers (i.e. effectively uint32_t).
  */
-#define check_u32_overflow(u32, inc) \
-       ((u32) > (UINT32_MAX - (inc)) ? 1 : 0)
+#define check_u32_overflow(_u32, _inc) \
+       ((_u32) > (UINT32_MAX - (_inc)))
 
 /*
  * For those constants to be shared between C and other sources, apply a 'U',
@@ -153,4 +153,4 @@
 #define ASSERT_SYM_PTR_ALIGN(sym) assert(((size_t)(sym) % __alignof__(*(sym))) == 0)
 
 
-#endif /* __UTILS_DEF_H__ */
+#endif /* UTILS_DEF_H */