mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
don't print error on socket read/write failure
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1588 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
366d1d3441
commit
981d5fac83
1 changed files with 7 additions and 3 deletions
|
|
@ -293,7 +293,7 @@ static int do_read(pa_ioline *l) {
|
||||||
|
|
||||||
/* Read some data */
|
/* Read some data */
|
||||||
if ((r = pa_iochannel_read(l->io, l->rbuf+l->rbuf_index+l->rbuf_valid_length, len)) <= 0) {
|
if ((r = pa_iochannel_read(l->io, l->rbuf+l->rbuf_index+l->rbuf_valid_length, len)) <= 0) {
|
||||||
if (r < 0) {
|
if (r < 0 && errno != ECONNRESET) {
|
||||||
pa_log("read(): %s", pa_cstrerror(errno));
|
pa_log("read(): %s", pa_cstrerror(errno));
|
||||||
failure(l, 0);
|
failure(l, 0);
|
||||||
} else
|
} else
|
||||||
|
|
@ -318,9 +318,13 @@ static int do_write(pa_ioline *l) {
|
||||||
|
|
||||||
while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length) {
|
while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_length) {
|
||||||
|
|
||||||
if ((r = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) < 0) {
|
if ((r = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) <= 0) {
|
||||||
pa_log("write(): %s", r < 0 ? pa_cstrerror(errno) : "EOF");
|
|
||||||
|
if (r < 0 && errno != EPIPE)
|
||||||
|
pa_log("write(): %s", pa_cstrerror(errno));
|
||||||
|
|
||||||
failure(l, 0);
|
failure(l, 0);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue