mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 00:04:53 +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:
@@ -229,7 +229,7 @@ static int expiration_str2struct(const struct aco_option *opt, struct ast_variab
|
||||
static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)
|
||||
{
|
||||
const struct ast_sip_contact *contact = obj;
|
||||
return (ast_asprintf(buf, "%lu", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
|
||||
return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
|
||||
}
|
||||
|
||||
/*! \brief Helper function which validates a permanent contact */
|
||||
@@ -765,7 +765,7 @@ static int cli_aor_print_body(void *obj, void *arg, int flags)
|
||||
indent = CLI_INDENT_TO_SPACES(context->indent_level);
|
||||
flexwidth = CLI_LAST_TABSTOP - indent - 12;
|
||||
|
||||
ast_str_append(&context->output_buffer, 0, "%*s: %-*.*s %12d\n",
|
||||
ast_str_append(&context->output_buffer, 0, "%*s: %-*.*s %12u\n",
|
||||
indent,
|
||||
"Aor",
|
||||
flexwidth, flexwidth,
|
||||
|
Reference in New Issue
Block a user