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

3 files changed, 8 insertions, 8 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",
diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c
index 146a02d59..b0a49cdf7 100644
--- a/res/res_pjsip/location.c
+++ b/res/res_pjsip/location.c
@@ -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,
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index b8839ca3c..511b61393 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -670,7 +670,7 @@ static int dtlsrekey_to_str(const void *obj, const intptr_t *args, char **buf)
 	const struct ast_sip_endpoint *endpoint = obj;
 
 	return ast_asprintf(
-		buf, "%d", endpoint->media.rtp.dtls_cfg.rekey) >=0 ? 0 : -1;
+		buf, "%u", endpoint->media.rtp.dtls_cfg.rekey) >=0 ? 0 : -1;
 }
 
 static int dtlscertfile_to_str(const void *obj, const intptr_t *args, char **buf)
@@ -787,7 +787,7 @@ static int tos_audio_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_endpoint *endpoint = obj;
 
-	if (ast_asprintf(buf, "%d", endpoint->media.tos_audio) == -1) {
+	if (ast_asprintf(buf, "%u", endpoint->media.tos_audio) == -1) {
 		return -1;
 	}
 	return 0;
@@ -797,7 +797,7 @@ static int tos_video_to_str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_endpoint *endpoint = obj;
 
-	if (ast_asprintf(buf, "%d", endpoint->media.tos_video) == -1) {
+	if (ast_asprintf(buf, "%u", endpoint->media.tos_video) == -1) {
 		return -1;
 	}
 	return 0;