diff options
| author | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2014-05-09 22:49:26 +0000 |
| commit | abd3e4040bd76058d0148884879858894258fb9f (patch) | |
| tree | c5695a0880c4928731b1aa864f862c6cffa57428 /main/security_events.c | |
| parent | f3b55da1b855b12a59f84fd9bf6768eb101cd910 (diff) | |
Allow Asterisk to compile under GCC 4.10
This resolves a large number of compiler warnings from GCC 4.10 which
cause the build to fail under dev mode. The vast majority are
signed/unsigned mismatches in printf-style format strings.
........
Merged revisions 413586 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 413587 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 413588 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/security_events.c')
| -rw-r--r-- | main/security_events.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/security_events.c b/main/security_events.c index bd8ed5dba..f4dc6fc6d 100644 --- a/main/security_events.c +++ b/main/security_events.c @@ -970,7 +970,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even if (req && !str) { ast_log(LOG_WARNING, "Required IE '%d' (%s) for security event " - "type '%d' (%s) not present\n", ie_type->ie_type, + "type '%u' (%s) not present\n", ie_type->ie_type, ast_event_get_ie_type_name(ie_type->ie_type), sec->event_type, ast_security_event_get_name(sec->event_type)); res = -1; @@ -997,7 +997,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even uint32_t val; val = *((const uint32_t *)(((const char *) sec) + ie_type->offset)); - json_string = ast_json_stringf("%d", val); + json_string = ast_json_stringf("%u", val); if (!json_string) { res = -1; break; @@ -1016,7 +1016,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even if (req && !addr->addr) { ast_log(LOG_WARNING, "Required IE '%d' (%s) for security event " - "type '%d' (%s) not present\n", ie_type->ie_type, + "type '%u' (%s) not present\n", ie_type->ie_type, ast_event_get_ie_type_name(ie_type->ie_type), sec->event_type, ast_security_event_get_name(sec->event_type)); res = -1; @@ -1036,7 +1036,7 @@ static int add_json_object(struct ast_json *json, const struct ast_security_even if (req && !tval) { ast_log(LOG_WARNING, "Required IE '%d' (%s) for security event " - "type '%d' (%s) not present\n", ie_type->ie_type, + "type '%u' (%s) not present\n", ie_type->ie_type, ast_event_get_ie_type_name(ie_type->ie_type), sec->event_type, ast_security_event_get_name(sec->event_type)); res = -1; @@ -1087,7 +1087,7 @@ static struct ast_json *alloc_security_event_json_object(const struct ast_securi return NULL; } - json_temp = ast_json_stringf("%d", sec->version); + json_temp = ast_json_stringf("%u", sec->version); if (!json_temp || ast_json_object_set(json_object, ast_event_get_ie_type_name(AST_EVENT_IE_EVENT_VERSION), json_temp)) { return NULL; } |