[pulseaudio-commits] r1588 - /branches/lennart/src/pulsecore/ioline.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Aug  8 22:50:37 2007
New Revision: 1588

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1588&root=3Dpulseaudio&vi=
ew=3Drev
Log:
don't print error on socket read/write failure

Modified:
    branches/lennart/src/pulsecore/ioline.c

Modified: branches/lennart/src/pulsecore/ioline.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
ioline.c?rev=3D1588&root=3Dpulseaudio&r1=3D1587&r2=3D1588&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/ioline.c (original)
+++ branches/lennart/src/pulsecore/ioline.c Wed Aug  8 22:50:37 2007
@@ -293,7 +293,7 @@
 =

         /* Read some data */
         if ((r =3D pa_iochannel_read(l->io, l->rbuf+l->rbuf_index+l->rbuf_=
valid_length, len)) <=3D 0) {
-            if (r < 0) {
+            if (r < 0 && errno !=3D ECONNRESET) {
                 pa_log("read(): %s", pa_cstrerror(errno));
                 failure(l, 0);
             } else
@@ -318,9 +318,13 @@
 =

     while (!l->dead && pa_iochannel_is_writable(l->io) && l->wbuf_valid_le=
ngth) {
 =

-        if ((r =3D pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbu=
f_valid_length)) < 0) {
-            pa_log("write(): %s", r < 0 ? pa_cstrerror(errno) : "EOF");
+        if ((r =3D pa_iochannel_write(l->io, l->wbuf+l->wbuf_index, l->wbu=
f_valid_length)) <=3D 0) {
+
+            if (r < 0 && errno !=3D EPIPE)
+                pa_log("write(): %s", pa_cstrerror(errno));
+
             failure(l, 0);
+            =

             return -1;
         }
 =