2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* stream.c: (stream_read_try) Use new ERRNO_IO_RETRY macro.
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 40e73ff..c4054d0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+ * stream.c: (stream_read_try) Use new ERRNO_IO_RETRY macro.
+
+2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
* network.h: Define a new ERRNO_IO_RETRY macro to test whether an I/O
operation should be retried. This eliminates the need to duplicate
the same logic testing for EAGAIN or EINTR in multiple places.
diff --git a/lib/stream.c b/lib/stream.c
index 7e75f0d..a50835e 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -624,8 +624,7 @@
return nbytes;
}
/* Error: was it transient (return -2) or fatal (return -1)? */
- return ((errno == EAGAIN) || (errno == EWOULDBLOCK) || (errno == EINTR)) ?
- -2 : -1;
+ return ERRNO_IO_RETRY(errno) ? -2 : -1;
}
/* Read up to smaller of size or SIZE_REMAIN() bytes to the stream, starting