mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user