diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-04 23:51:23 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-04 23:51:23 +0000 |
commit | 5b2cf44b139e35d4263525903ef7ae33162ebbba (patch) | |
tree | c3329148ba2c5391b5908595b0739365cc79c5b6 /formats | |
parent | 635fe556086497c686843a653a7fd1a92a247b6e (diff) |
Merged revisions 7805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7805 | kpfleming | 2006-01-04 17:51:03 -0600 (Wed, 04 Jan 2006) | 2 lines
use proper fwrite() parameters and return value
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7806 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rw-r--r-- | formats/format_pcm.c | 6 | ||||
-rw-r--r-- | formats/format_pcm_alaw.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 7a1e98b7a..87363239d 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -201,11 +201,11 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence) size_t res; while (left) { - res = fwrite(ulaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left, - sizeof(ulaw_silence[0]), fs->f); + res = fwrite(ulaw_silence, sizeof(ulaw_silence[0]), + (left > BUF_SIZE) ? BUF_SIZE : left, fs->f); if (res == -1) return res; - left -= res; + left -= res * sizeof(ulaw_silence[0]); } return offset; } diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index 811a6ef6a..b26796bda 100644 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -276,11 +276,11 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence) size_t res; while (left) { - res = fwrite(alaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left, - sizeof(alaw_silence[0]), fs->f); + res = fwrite(alaw_silence, sizeof(alaw_silence[0]), + (left > BUF_SIZE) ? BUF_SIZE : left, fs->f); if (res == -1) return res; - left -= res; + left -= res * sizeof(alaw_silence[0]); } return offset; } |