From 9c61245061dbd96d96acb608a5b0f6e77d1472f2 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Thu, 23 Apr 2015 15:00:42 +0200
Subject: [PATCH] Clang: change previous tautological-compare fixes.
clang can warn about a so called tautological-compare, when it finds
comparisons which are logically always true, and are therefor deemed
unnecessary.
Exanple:
unsigned int x = 4;
if (x > 0) // x is always going to be bigger than 0
Enum Case:
Each enumeration is its own type. Enums are an integer type but they
do not have to be *signed*. C leaves it up to the compiler as an
implementation option what to consider the integer type of a particu-
lar enumeration is. Gcc treats an enum without negative values as
an int while clang treats this enum as an unsigned int.
rmudgett & mmichelson: cast the enum to (unsigned int) in assert.
The cast does have an effect. For gcc, which seems to treat all enums
as int, the cast to unsigned int will eliminate the possibility of
negative values being allowed. For clang, which seems to treat enums
without any negative members as unsigned int, the cast will have no
effect. If for some reason in the future a negative value is ever
added to the enum the assert will still catch the negative value.
ASTERISK-24917
Change-Id: I0557ae0154a0b7de68883848a609309cdf0aee6a
---
main/event.c | 2 +-
main/security_events.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/event.c b/main/event.c
index 5796aab190..94365e26a3 100644
--- a/main/event.c
+++ b/main/event.c
@@ -295,7 +295,7 @@ const char *ast_event_get_type_name(const struct ast_event *event)
type = ast_event_get_type(event);
- if (type >= ARRAY_LEN(event_names)) {
+ if ((unsigned int)type >= ARRAY_LEN(event_names)) {
ast_log(LOG_ERROR, "Invalid event type - '%u'\n", type);
return "";
}
diff --git a/main/security_events.c b/main/security_events.c
index ca24921bac..cb8959017a 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -427,7 +427,7 @@ const char *ast_security_event_severity_get_name(
static int check_event_type(const enum ast_security_event_type event_type)
{
- if (event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
+ if ((unsigned int)event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
ast_log(LOG_ERROR, "Invalid security event type %u\n", event_type);
return -1;
}
@@ -680,7 +680,7 @@ int ast_security_event_report(const struct ast_security_event_common *sec)
{
int res;
- if (sec->event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
+ if ((unsigned int)sec->event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
ast_log(LOG_ERROR, "Invalid security event type\n");
return -1;
}
--
GitLab