diff options
Diffstat (limited to 'formats/format_wav_gsm.c')
| -rw-r--r-- | formats/format_wav_gsm.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 5b3853ef7..f11b27277 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -424,8 +424,16 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext) int res; if ((res = fread(msdata, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) { - if (res && (res != 1)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); + if (feof(s->f)) { + if (res) { + ast_log(LOG_WARNING, "Incomplete frame data at end of %s file " + "(expected %d bytes, read %d)\n", + ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res); + } + } else { + ast_log(LOG_ERROR, "Error while reading %s file: %s\n", + ast_format_get_name(s->fr.subclass.format), strerror(errno)); + } return NULL; } /* Convert from MS format to two real GSM frames */ @@ -513,7 +521,7 @@ static int wav_seek(struct ast_filestream *fs, off_t sample_offset, int whence) int i; fseek(fs->f, 0, SEEK_END); for (i=0; i< (offset - max) / MSGSM_FRAME_SIZE; i++) { - if (!fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f)) { + if (fwrite(msgsm_silence, 1, MSGSM_FRAME_SIZE, fs->f) != MSGSM_FRAME_SIZE) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); } } |