diff options
| author | Diederik de Groot <ddegroot@talon.nl> | 2015-04-22 11:17:56 +0200 |
|---|---|---|
| committer | Diederik de Groot <ddegroot@talon.nl> | 2015-04-22 18:09:23 +0200 |
| commit | d6dfc85666370e1bc71f050bd5dfaf12cb629734 (patch) | |
| tree | a259be47666466e47bd69f3118239967d4daa9b3 | |
| parent | d08446ec36600348090eb2451c5a9a7aadd633de (diff) | |
Clang: Fix some more tautological-compare warnings.
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: Ief23ef68916192b9b72dabe702b543ecfeca0b62
| -rw-r--r-- | channels/chan_skinny.c | 4 | ||||
| -rw-r--r-- | main/security_events.c | 2 | ||||
| -rw-r--r-- | res/res_security_log.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index a089c65d8..e875a66ee 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -7488,6 +7488,7 @@ static void *skinny_session(void *data) struct skinnysession *s = data; int dlen = 0; + int eventmessage = 0; struct pollfd fds[1]; if (!s) { @@ -7544,7 +7545,8 @@ static void *skinny_session(void *data) break; } - if (letohl(req->e) < 0) { + eventmessage = letohl(req-e); + if (eventmessage < 0) { ast_log(LOG_ERROR, "Event Message is NULL from socket %d, This is bad\n", s->fd); break; } diff --git a/main/security_events.c b/main/security_events.c index 5a8df66d1..1d8295265 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -428,7 +428,7 @@ static struct ast_manager_event_blob *security_event_to_ami_blob(struct ast_json event_type_json = ast_json_object_get(json, "SecurityEvent"); event_type = ast_json_integer_get(event_type_json); - ast_assert(event_type >= 0 && event_type < AST_SECURITY_EVENT_NUM_TYPES); + ast_assert((unsigned int)event_type < AST_SECURITY_EVENT_NUM_TYPES); if (!(str = ast_str_create(SECURITY_EVENT_BUF_INIT_LEN))) { return NULL; diff --git a/res/res_security_log.c b/res/res_security_log.c index e56f7f76f..78ca1218c 100644 --- a/res/res_security_log.c +++ b/res/res_security_log.c @@ -98,7 +98,7 @@ static void security_event_stasis_cb(struct ast_json *json) event_type_json = ast_json_object_get(json, "SecurityEvent"); event_type = ast_json_integer_get(event_type_json); - ast_assert(event_type >= 0 && event_type < AST_SECURITY_EVENT_NUM_TYPES); + ast_assert((unsigned int)event_type < AST_SECURITY_EVENT_NUM_TYPES); if (!(str = ast_str_thread_get(&security_event_buf, SECURITY_EVENT_BUF_INIT_LEN))) { |