diff options
Diffstat (limited to 'formats/format_sln.c')
-rw-r--r-- | formats/format_sln.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/formats/format_sln.c b/formats/format_sln.c index f68becb0f..e73916e18 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -36,20 +36,15 @@ ASTERISK_REGISTER_FILE() static struct ast_frame *generic_read(struct ast_filestream *s, int *whennext, unsigned int buf_size) { - int res; - /* Send a frame from the file to the appropriate channel */ + size_t res; + /* Send a frame from the file to the appropriate channel */ AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, buf_size); - if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) { - if (feof(s->f)) { - if (res) { - ast_debug(3, "Incomplete frame data at end of %s file " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); - } - } else { - ast_log(LOG_ERROR, "Error while reading %s file: %s\n", - ast_format_get_name(s->fr.subclass.format), strerror(errno)); + if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) < 1) { + if (res) { + ast_log(LOG_WARNING, "Short read of %s data (expected %d bytes, read %zu): %s\n", + ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res, + strerror(errno)); } return NULL; } |