mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -225,8 +225,12 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s,
|
||||
while (!tmp->eos) {
|
||||
if (ogg_stream_flush(&tmp->os, &tmp->og) == 0)
|
||||
break;
|
||||
fwrite(tmp->og.header, 1, tmp->og.header_len, s->f);
|
||||
fwrite(tmp->og.body, 1, tmp->og.body_len, s->f);
|
||||
if (!fwrite(tmp->og.header, 1, tmp->og.header_len, s->f)) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
if (!fwrite(tmp->og.body, 1, tmp->og.body_len, s->f)) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
if (ogg_page_eos(&tmp->og))
|
||||
tmp->eos = 1;
|
||||
}
|
||||
@@ -251,8 +255,12 @@ static void write_stream(struct vorbis_desc *s, FILE *f)
|
||||
if (ogg_stream_pageout(&s->os, &s->og) == 0) {
|
||||
break;
|
||||
}
|
||||
fwrite(s->og.header, 1, s->og.header_len, f);
|
||||
fwrite(s->og.body, 1, s->og.body_len, f);
|
||||
if (!fwrite(s->og.header, 1, s->og.header_len, f)) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
if (!fwrite(s->og.body, 1, s->og.body_len, f)) {
|
||||
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
|
||||
}
|
||||
if (ogg_page_eos(&s->og)) {
|
||||
s->eos = 1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user