kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Asterisk to compile under GCC 4.10

Browse Source 
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
This commit is contained in:
Kinsey Moore
2014-05-09 22:49:26 +00:00
parent f3b55da1b8
commit abd3e4040b
138 changed files with 726 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/security_events.c
View File

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