Introduce the osl() wrapper and rename error_txt() to adu_strerror().

[adu.git] / fd.c

diff --git a/fd.c b/fd.c
index 7040b87865b3965f3a7eff7963b8584294d637b8..52569a1b4c9266c01fec1d5ddb3bc379d10e4600 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -38,7 +38,7 @@ ssize_t para_write(int fd, const void *buf, size_t size)
                ret = write(fd, buf, size);
                if ((ret < 0) && (errno == EAGAIN || errno == EINTR))
                        continue;
-               return ret >= 0? ret : -E_WRITE;
+               return ret >= 0? ret : -ERRNO_TO_ERROR(errno);
        }
 }
 
@@ -239,34 +239,6 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno)
        *max_fileno = MAX(*max_fileno, fd);
 }
 
-/**
- * Paraslash's wrapper for fgets(3).
- *
- * \param line Pointer to the buffer to store the line.
- * \param size The size of the buffer given by \a line.
- * \param f The stream to read from.
- *
- * \return Unlike the standard fgets() function, an integer value
- * is returned. On success, this function returns 1. On errors, -E_FGETS
- * is returned. A zero return value indicates an end of file condition.
- */
-__must_check int para_fgets(char *line, int size, FILE *f)
-{
-again:
-       if (fgets(line, size, f))
-               return 1;
-       if (feof(f))
-               return 0;
-       if (!ferror(f))
-               return -E_FGETS;
-       if (errno != EINTR) {
-               ERROR_LOG("%s\n", strerror(errno));
-               return -E_FGETS;
-       }
-       clearerr(f);
-       goto again;
-}
-
 /**
  * Paraslash's wrapper for mmap.
  *