diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-04-21 13:04:44 -0400 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-04-25 16:24:37 -0500 |
| commit | 1b50df78d069632e5607e2937461a33d7f568431 (patch) | |
| tree | e9768588d01be3d2a2c1de11821fe59b138e5000 /formats/format_ogg_vorbis.c | |
| parent | f7ca69809a0c39be4cf42844c7d7d474e68d8305 (diff) | |
cleanup: Fix fread() and fwrite() error handling
Cleaned up some of the incorrect uses of fread() and fwrite(), mostly in
the format modules. Neither of these functions will ever return a value
less than 0, which we were checking for in some cases.
I've introduced a fair amount of duplication in the format modules, but
I plan to change how format modules work internally in a subsequent
patch set, so this is simply a stop-gap.
Change-Id: I8ca1cd47c20b2c0b72088bd13b9046f6977aa872
Diffstat (limited to 'formats/format_ogg_vorbis.c')
| -rw-r--r-- | formats/format_ogg_vorbis.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c index cf3b1c0e9..a7a9447e7 100644 --- a/formats/format_ogg_vorbis.c +++ b/formats/format_ogg_vorbis.c @@ -183,10 +183,10 @@ static int ogg_vorbis_rewrite(struct ast_filestream *s, while (!tmp->eos) { if (ogg_stream_flush(&tmp->os, &tmp->og) == 0) break; - if (!fwrite(tmp->og.header, 1, tmp->og.header_len, s->f)) { + if (fwrite(tmp->og.header, 1, tmp->og.header_len, s->f) != tmp->og.header_len) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } - if (!fwrite(tmp->og.body, 1, tmp->og.body_len, s->f)) { + if (fwrite(tmp->og.body, 1, tmp->og.body_len, s->f) != tmp->og.body_len) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } if (ogg_page_eos(&tmp->og)) @@ -213,10 +213,10 @@ static void write_stream(struct ogg_vorbis_desc *s, FILE *f) if (ogg_stream_pageout(&s->os, &s->og) == 0) { break; } - 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.header, 1, s->og.header_len, f) != s->og.header_len) { + ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } - if (!fwrite(s->og.body, 1, s->og.body_len, f)) { + if (fwrite(s->og.body, 1, s->og.body_len, f) != s->og.body_len) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } if (ogg_page_eos(&s->og)) { |