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 /res/res_pjsip/config_transport.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 'res/res_pjsip/config_transport.c')
| -rw-r--r-- | res/res_pjsip/config_transport.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index ce57ab6de..22581ca52 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -519,7 +519,7 @@ static int transport_tos_handler(const struct aco_option *opt, struct ast_variab value = value << 2; ast_log(LOG_WARNING, "transport '%s' - 'tos' value '%s' uses bits that are " - "discarded when converted to DSCP. Using equivalent %d instead.\n", + "discarded when converted to DSCP. Using equivalent %u instead.\n", ast_sorcery_object_get_id(transport), var->value, value); } @@ -531,7 +531,7 @@ static int tos_to_str(const void *obj, const intptr_t *args, char **buf) { const struct ast_sip_transport *transport = obj; - if (ast_asprintf(buf, "%d", transport->tos) == -1) { + if (ast_asprintf(buf, "%u", transport->tos) == -1) { return -1; } return 0; @@ -605,7 +605,7 @@ static int cli_print_body(void *obj, void *arg, int flags) pj_sockaddr_print(&transport->host, hoststr, sizeof(hoststr), 3); - ast_str_append(&context->output_buffer, 0, "%*s: %-21s %6s %5d %5d %s\n", + ast_str_append(&context->output_buffer, 0, "%*s: %-21s %6s %5u %5u %s\n", CLI_INDENT_TO_SPACES(context->indent_level), "Transport", ast_sorcery_object_get_id(transport), ARRAY_IN_BOUNDS(transport->type, transport_types) ? transport_types[transport->type] : "Unknown", |