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 --- channels/iax2/parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'channels/iax2/parser.c') diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c index ee4a6c3be..f5c7ba05d 100644 --- a/channels/iax2/parser.c +++ b/channels/iax2/parser.c @@ -108,7 +108,7 @@ static void dump_string_hex(char *output, int maxlen, void *value, int len) int i = 0; while (len-- && (i + 1) * 4 < maxlen) { - sprintf(output + (4 * i), "\\x%2.2x", *((unsigned char *)value + i)); + sprintf(output + (4 * i), "\\x%2.2x", (unsigned)*((unsigned char *)value + i)); i++; } } @@ -1149,7 +1149,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) ies->osptokenblock[count] = (char *)data + 2 + 1; ies->ospblocklength[count] = len - 1; } else { - snprintf(tmp, (int)sizeof(tmp), "Expected OSP token block index to be 0~%d but was %d\n", IAX_MAX_OSPBLOCK_NUM - 1, count); + snprintf(tmp, (int)sizeof(tmp), "Expected OSP token block index to be 0~%d but was %u\n", IAX_MAX_OSPBLOCK_NUM - 1, count); errorf(tmp); } break; -- cgit v1.2.3