mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-18 07:48:14 +00:00
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
This commit is contained in:
@@ -432,9 +432,9 @@ static int channel_read_rtp(struct ast_channel *chan, const char *type, const ch
|
||||
} else if (!strcmp(type, "direct")) {
|
||||
ast_copy_string(buf, ast_sockaddr_stringify(&media->direct_media_addr), buflen);
|
||||
} else if (!strcmp(type, "secure")) {
|
||||
snprintf(buf, buflen, "%u", media->srtp ? 1 : 0);
|
||||
snprintf(buf, buflen, "%d", media->srtp ? 1 : 0);
|
||||
} else if (!strcmp(type, "hold")) {
|
||||
snprintf(buf, buflen, "%u", media->held ? 1 : 0);
|
||||
snprintf(buf, buflen, "%d", media->held ? 1 : 0);
|
||||
} else {
|
||||
ast_log(AST_LOG_WARNING, "Unknown type field '%s' specified for 'rtp' information\n", type);
|
||||
return -1;
|
||||
@@ -580,7 +580,7 @@ static int channel_read_pjsip(struct ast_channel *chan, const char *type, const
|
||||
dlg = channel->session->inv_session->dlg;
|
||||
|
||||
if (!strcmp(type, "secure")) {
|
||||
snprintf(buf, buflen, "%u", dlg->secure ? 1 : 0);
|
||||
snprintf(buf, buflen, "%d", dlg->secure ? 1 : 0);
|
||||
} else if (!strcmp(type, "target_uri")) {
|
||||
pjsip_uri_print(PJSIP_URI_IN_REQ_URI, dlg->target, buf, buflen);
|
||||
buf_copy = ast_strdupa(buf);
|
||||
|
||||
Reference in New Issue
Block a user