From: Andre Noll <maan@systemlinux.org>
Date: Tue, 9 Oct 2007 18:10:22 +0000 (+0200)
Subject: Get rid of -E_F_GETFL and -E_F_SETFL.
X-Git-Tag: v0.3.0~290
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5a5fe7330e078cd43ce9d90fe2cc67058015e6da;p=paraslash.git

Get rid of -E_F_GETFL and -E_F_SETFL.

Return the proper errno instead, using the new ERRNO_TO_PARA_ERROR macro..
---

diff --git a/error.h b/error.h
index 2d03585a..62540f4f 100644
--- a/error.h
+++ b/error.h
@@ -409,8 +409,6 @@ extern const char **para_errlist[];
 
 #define FD_ERRORS \
 	PARA_ERROR(NOTDIR, "error: not a directory"), \
-	PARA_ERROR(F_GETFL, "failed to get fd flags"), \
-	PARA_ERROR(F_SETFL, "failed to set fd flags"), \
 	PARA_ERROR(FGETS, "fgets error"), \
 	PARA_ERROR(EXIST, "file or directory already exists"), \
 	PARA_ERROR(ISDIR, "error: is a directory"), \
diff --git a/fd.c b/fd.c
index e5aa59f5..6bd21b5b 100644
--- a/fd.c
+++ b/fd.c
@@ -60,19 +60,20 @@ int para_select(int n, fd_set *readfds, fd_set *writefds,
 }
 
 /**
- * set a file descriptor to non-blocking mode
+ * Set a file descriptor to non-blocking mode.
  *
- * \param fd The file descriptor
+ * \param fd The file descriptor.
  *
- * \returns 1 on success, -E_F_GETFL, -E_F_SETFL, on errors.
+ * \return Standard.
  */
 int mark_fd_nonblock(int fd)
 {
 	int flags = fcntl(fd, F_GETFL);
 	if (flags < 0)
-		return -E_F_GETFL;
-	if (fcntl(fd, F_SETFL, ((long)flags) | O_NONBLOCK) < 0)
-		return -E_F_SETFL;
+		return -ERRNO_TO_PARA_ERROR(errno);
+	flags = fcntl(fd, F_SETFL, ((long)flags) | O_NONBLOCK);
+	if (flags < 0)
+		return -ERRNO_TO_PARA_ERROR(errno);
 	return 1;
 }