From 5a5fe7330e078cd43ce9d90fe2cc67058015e6da Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 9 Oct 2007 20:10:22 +0200 Subject: [PATCH] Get rid of -E_F_GETFL and -E_F_SETFL. Return the proper errno instead, using the new ERRNO_TO_PARA_ERROR macro.. --- error.h | 2 -- fd.c | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) 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; } -- 2.39.2