diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2008-11-21 23:22:43 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-11-21 23:22:43 +0000 |
commit | 2aed9ea1819bcb477a9dcb4b58b0015c1478297b (patch) | |
tree | e954deda9be088053e3516039aa523f978bfccd5 | |
parent | 047099d822f885478dfb94ce8dbe45d379f0e8b0 (diff) |
minor fixes to accommodate compilers who check return result usage
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@5365 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | dahdi_monitor.c | 19 | ||||
-rw-r--r-- | fxotune.c | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/dahdi_monitor.c b/dahdi_monitor.c index 183812d..a328daa 100644 --- a/dahdi_monitor.c +++ b/dahdi_monitor.c @@ -575,21 +575,21 @@ int main(int argc, char *argv[]) break; readcount += res_brx; if (ofh[MON_BRX]) - fwrite(buf_brx, 1, res_brx, ofh[MON_BRX]); + x = fwrite(buf_brx, 1, res_brx, ofh[MON_BRX]); if (multichannel) { res_tx = read(pfd[MON_TX], buf_tx, res_brx); if (res_tx < 1) break; if (ofh[MON_TX]) - fwrite(buf_tx, 1, res_tx, ofh[MON_TX]); + x = fwrite(buf_tx, 1, res_tx, ofh[MON_TX]); if (stereo_output && ofh[MON_STEREO]) { for (x=0;x<res_tx;x++) { stereobuf[x*2] = buf_brx[x]; stereobuf[x*2+1] = buf_tx[x]; } - fwrite(stereobuf, 1, res_tx*2, ofh[MON_STEREO]); + x = fwrite(stereobuf, 1, res_tx*2, ofh[MON_STEREO]); } if (visual) { @@ -605,32 +605,33 @@ int main(int argc, char *argv[]) if (res_brx < 1) break; if (ofh[MON_PRE_BRX]) - fwrite(buf_brx, 1, res_brx, ofh[MON_PRE_BRX]); + x = fwrite(buf_brx, 1, res_brx, ofh[MON_PRE_BRX]); if (multichannel) { res_tx = read(pfd[MON_PRE_TX], buf_tx, res_brx); if (res_tx < 1) break; if (ofh[MON_PRE_TX]) - fwrite(buf_tx, 1, res_tx, ofh[MON_PRE_TX]); + x = fwrite(buf_tx, 1, res_tx, ofh[MON_PRE_TX]); if (stereo_output && ofh[MON_PRE_STEREO]) { for (x=0;x<res_brx;x++) { stereobuf[x*2] = buf_brx[x]; stereobuf[x*2+1] = buf_tx[x]; } - fwrite(stereobuf, 1, res_brx*2, ofh[MON_PRE_STEREO]); + x = fwrite(stereobuf, 1, res_brx*2, ofh[MON_PRE_STEREO]); } } } if (ossoutput && afd) { if (stereo) { - for (x=0;x<res_brx;x++) + for (x=0;x<res_brx;x++) { buf_tx[x<<1] = buf_tx[(x<<1) + 1] = buf_brx[x]; - write(afd, buf_tx, res_brx << 1); + } + x = write(afd, buf_tx, res_brx << 1); } else - write(afd, buf_brx, res_brx); + x = write(afd, buf_brx, res_brx); } if (limit && readcount >= limit) { @@ -110,7 +110,7 @@ static int fxotune_read(int fd, void *buffer, int len) res = read(fd, buffer, len); if ((res > 0) && (audio_dump_fd != -1)) { - write(audio_dump_fd, buffer, len); + res = write(audio_dump_fd, buffer, len); } return res; |