From abd3e4040bd76058d0148884879858894258fb9f Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Fri, 9 May 2014 22:49:26 +0000 Subject: 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 --- main/logger.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main/logger.c') diff --git a/main/logger.c b/main/logger.c index 2f81760f0..2c0f3f4a3 100644 --- a/main/logger.c +++ b/main/logger.c @@ -248,7 +248,7 @@ static void make_components(struct logchannel *chan) unsigned int logmask = 0; char *stringp = ast_strdupa(chan->components); unsigned int x; - int verb_level; + unsigned int verb_level; /* Default to using option_verbose as the verbosity level of the logging channel. */ verb_level = -1; @@ -1153,7 +1153,7 @@ static void ast_log_vsyslog(struct logmsg *msg) char call_identifier_str[13]; if (msg->callid) { - snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", msg->callid->call_identifier); + snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", (unsigned)msg->callid->call_identifier); } else { call_identifier_str[0] = '\0'; } @@ -1199,7 +1199,7 @@ static void logger_print_normal(struct logmsg *logmsg) char call_identifier_str[13]; if (logmsg->callid) { - snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", logmsg->callid->call_identifier); + snprintf(call_identifier_str, sizeof(call_identifier_str), "[C-%08x]", (unsigned)logmsg->callid->call_identifier); } else { call_identifier_str[0] = '\0'; } @@ -1438,7 +1438,7 @@ void close_logger(void) void ast_callid_strnprint(char *buffer, size_t buffer_size, struct ast_callid *callid) { - snprintf(buffer, buffer_size, "[C-%08x]", callid->call_identifier); + snprintf(buffer, buffer_size, "[C-%08x]", (unsigned)callid->call_identifier); } struct ast_callid *ast_create_callid(void) @@ -2076,7 +2076,7 @@ int ast_logger_register_level(const char *name) AST_RWLIST_UNLOCK(&logchannels); - ast_debug(1, "Registered dynamic logger level '%s' with index %d.\n", name, available); + ast_debug(1, "Registered dynamic logger level '%s' with index %u.\n", name, available); update_logchannels(); @@ -2114,7 +2114,7 @@ void ast_logger_unregister_level(const char *name) levels[x] = NULL; AST_RWLIST_UNLOCK(&logchannels); - ast_debug(1, "Unregistered dynamic logger level '%s' with index %d.\n", name, x); + ast_debug(1, "Unregistered dynamic logger level '%s' with index %u.\n", name, x); update_logchannels(); } else { -- cgit v1.2.3