From: Mike Brady Date: Fri, 7 Apr 2017 17:45:28 +0000 (+0100) Subject: Improve error reporting in non-blocking write code X-Git-Tag: 3.1.s5~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5855264eff7c8267bbbc489a8a1160b70446c855;p=thirdparty%2Fshairport-sync.git Improve error reporting in non-blocking write code --- diff --git a/common.c b/common.c index 0776407d..0a60a1af 100644 --- a/common.c +++ b/common.c @@ -647,9 +647,10 @@ ssize_t non_blocking_write(int fd, const void *buf, size_t count) { // debug(1, "non-blocking write error waiting for pipe to become ready for writing..."); } else if (rc == 0) { // warn("non-blocking write timeout waiting for pipe to become ready for writing"); - rc = -2; + rc = -1; + errno = -ETIME; } else { // rc > 0, implying it might be ready - size_t bytes_written = write(fd, ibuf, bytes_remaining); + ssize_t bytes_written = write(fd, ibuf, bytes_remaining); if (bytes_written == -1) { // debug(1,"Error %d in non_blocking_write: \"%s\".",errno,strerror(errno)); rc = -1;