mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +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:
@@ -70,11 +70,11 @@ static void silk_sdp_generate(const struct ast_format_attr *format_attr, unsigne
|
||||
struct silk_attr *attr = (struct silk_attr *) format_attr;
|
||||
|
||||
if ((attr->maxbitrate > 5000) && (attr->maxbitrate < 40000)) {
|
||||
ast_str_append(str, 0, "a=fmtp:%d maxaveragebitrate=%d\r\n", payload, attr->maxbitrate);
|
||||
ast_str_append(str, 0, "a=fmtp:%u maxaveragebitrate=%u\r\n", payload, attr->maxbitrate);
|
||||
}
|
||||
|
||||
ast_str_append(str, 0, "a=fmtp:%d usedtx=%d\r\n", payload, attr->dtx);
|
||||
ast_str_append(str, 0, "a=fmtp:%d useinbandfec=%d\r\n", payload, attr->fec);
|
||||
ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
|
||||
ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
|
||||
}
|
||||
|
||||
static enum ast_format_cmp_res silk_cmp(const struct ast_format_attr *fattr1, const struct ast_format_attr *fattr2)
|
||||
@@ -152,7 +152,7 @@ static int silk_isset(const struct ast_format_attr *fattr, va_list ap)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
|
||||
ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -213,7 +213,7 @@ static void silk_set(struct ast_format_attr *fattr, va_list ap)
|
||||
attr->packetloss_percentage = (va_arg(ap, int));
|
||||
break;
|
||||
default:
|
||||
ast_log(LOG_WARNING, "unknown attribute type %d\n", key);
|
||||
ast_log(LOG_WARNING, "unknown attribute type %u\n", key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user