diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-04-26 15:53:50 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-04-26 15:53:50 -0500 |
| commit | 2d277996b7a306165931d50cabccea0bc7daa0da (patch) | |
| tree | 4d357e70d7450dda74e67b4c729036bd4a670bcc | |
| parent | 145f65598cd11089226cb95c4809b098cf6e637a (diff) | |
| parent | d6dfc85666370e1bc71f050bd5dfaf12cb629734 (diff) | |
Merge "Clang: Fix some more tautological-compare warnings." into 13
| -rw-r--r-- | channels/chan_skinny.c | 4 | ||||
| -rw-r--r-- | res/res_security_log.c | 2 |
2 files changed, 4 insertions, 2 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/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))) { |