sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clang: Fix some more tautological-compare warnings."

This commit is contained in:
Matt Jordan 2015-04-26 15:53:58 -05:00 committed by Gerrit Code Review
parent 835cf04706 f8e21a1adf
commit 0c92a85aee
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_skinny.c
View File

@ -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;
}

2
res/res_security_log.c
View File

@ -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))) {