From: Andre Noll <maan@systemlinux.org>
Date: Sun, 6 Apr 2008 12:38:29 +0000 (+0200)
Subject: Get rid of E_MUNMAP.
X-Git-Tag: v0.3.2~6
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f18341c277abf63dae1598b76cdd207006a509e0

Get rid of E_MUNMAP.

Use the system error code instead.
---

diff --git a/error.h b/error.h
index f492eff1..53320d4b 100644
--- a/error.h
+++ b/error.h
@@ -360,7 +360,6 @@ extern const char **para_errlist[];
 	PARA_ERROR(FGETS, "fgets error"), \
 	PARA_ERROR(EMPTY, "file empty"), \
 	PARA_ERROR(MMAP, "mmap error"), \
-	PARA_ERROR(MUNMAP, "munmap failed"), \
 
 
 #define WRITE_ERRORS \
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.