X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=fd.c;h=39e98374b3acb9ccc727426bf0b6b06d047b57e7;hp=9fe88679d2d88855a27a3486d4646bd1632c965f;hb=2e24b91148dda8ea52b308a4b5e0ef08c0f11267;hpb=cd5cfb4c2dbbf5615c78d1e439f0cbfb08437b43

diff --git a/fd.c b/fd.c
index 9fe8867..39e9837 100644
--- a/fd.c
+++ b/fd.c
@@ -24,19 +24,20 @@
  * \param size The length of \a buf in bytes.
  *
  * This function writes out the given buffer and retries if an interrupt
- * occurred during the write.
+ * occurred during the write. The file descriptor is assumed to be in blocking
+ * mode (i.e., EAGAIN is treated as an error).
  *
  * \return Standard.
  *
  * \sa write(2).
  */
-ssize_t __write(int fd, const void *buf, size_t size)
+static ssize_t __write(int fd, const void *buf, size_t size)
 {
 	ssize_t ret;
 
 	for (;;) {
 		ret = write(fd, buf, size);
-		if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
+		if (ret < 0 && errno == EINTR)
 			continue;
 		return ret >= 0? ret : -ERRNO_TO_ERROR(errno);
 	}
@@ -175,9 +176,10 @@ int adu_opendir(const char *dirname, DIR **dir, int *cwd)
 	if (*dir)
 		return 1;
 	ret = -ERRNO_TO_ERROR(errno);
-/* Ignore return value of fchdir() and close(). We're busted anyway. */
-	if (cwd)
-		fchdir(*cwd);
+	/* Ignore return value of fchdir() and close(). We're busted anyway. */
+	if (cwd) {
+		int __a_unused ret2 = fchdir(*cwd); /* STFU, gcc */
+	}
 close_cwd:
 	if (cwd)
 		close(*cwd);