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/asterisk.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/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 8a619b1eb..a3bb88198 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -823,14 +823,14 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl ast_cli(a->fd, "\nSystem Statistics\n"); ast_cli(a->fd, "-----------------\n"); - ast_cli(a->fd, " System Uptime: %lu hours\n", uptime); + ast_cli(a->fd, " System Uptime: %ld hours\n", uptime); ast_cli(a->fd, " Total RAM: %" PRIu64 " KiB\n", physmem / 1024); ast_cli(a->fd, " Free RAM: %" PRIu64 " KiB\n", freeram); #if defined(HAVE_SYSINFO) ast_cli(a->fd, " Buffer RAM: %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024); #endif #if defined (HAVE_SYSCTL) || defined(HAVE_SWAPCTL) - ast_cli(a->fd, " Total Swap Space: %u KiB\n", totalswap); + ast_cli(a->fd, " Total Swap Space: %d KiB\n", totalswap); ast_cli(a->fd, " Free Swap Space: %" PRIu64 " KiB\n\n", freeswap); #endif ast_cli(a->fd, " Number of Processes: %d \n\n", nprocs); @@ -1706,7 +1706,7 @@ static int ast_makesocket(void) ast_log(LOG_WARNING, "Unable to change ownership of %s: %s\n", ast_config_AST_SOCKET, strerror(errno)); if (!ast_strlen_zero(ast_config_AST_CTL_PERMISSIONS)) { - int p1; + unsigned int p1; mode_t p; sscanf(ast_config_AST_CTL_PERMISSIONS, "%30o", &p1); p = p1; |