X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=58851723978fb3c9856f87aa35d65a7141c162d7;hp=48e2faf97c6d3e2bcb1616ebef04db48e2003d9e;hb=128e2e3112f2260e35ee48f1db415c577a058edd;hpb=d2a600590a2607d2bd729f3079aaec320efe7990 diff --git a/fd.c b/fd.c index 48e2faf9..58851723 100644 --- a/fd.c +++ b/fd.c @@ -15,7 +15,7 @@ #include "para.h" #include "error.h" -/* +/** * Write a buffer to a file descriptor, re-write on short writes. * * \param fd The file descriptor. @@ -154,16 +154,16 @@ void para_fd_set(int fd, fd_set *fds, int *max_fileno) } /** -* 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. -*/ + * 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: @@ -393,17 +393,19 @@ out: */ int para_munmap(void *start, size_t length) { + int err; if (munmap(start, length) >= 0) return 1; + err = errno; PARA_ERROR_LOG("munmap (%p/%zu) failed: %s\n", start, length, - strerror(errno)); - return -E_MUNMAP; + strerror(err)); + return -ERRNO_TO_PARA_ERROR(err); } /** - * check a file descriptor for writability + * Check a file descriptor for writability. * - * \param fd the file descriptor + * \param fd The file descriptor. * * \return positive if fd is ready for writing, zero if it isn't, negative if * an error occurred.