summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-08 20:50:37 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-08 20:50:37 +0000
commit981d5fac832b8c02358b4787e14d519c26e4d9ca (patch)
treef800a4519ad554eb286173b5931001c83833ce30 /src/pulsecore
parent366d1d3441136551e32d375831c1edd85fd370f2 (diff)
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
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/ioline.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pulsecore/ioline.c b/src/pulsecore/ioline.c
index 07b60bee..23a90a78 100644
--- a/src/pulsecore/ioline.c
+++ b/src/pulsecore/ioline.c
@@ -293,7 +293,7 @@ static int do_read(pa_ioline *l) {
/* Read some data */
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));
failure(l, 0);
} 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) {
- 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 = pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbuf_valid_length)) <= 0) {
+
+ if (r < 0 && errno != EPIPE)
+ pa_log("write(): %s", pa_cstrerror(errno));
+
failure(l, 0);
+
return -1;
}