X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fd.c;h=429960cc0ab3d822811a1702c56c99a9e4c1ff10;hb=ca059ef393a5ea00c3318314b3de5229f9fd7ea0;hp=978ada45de9211dc84363874682603d0d6d6e558;hpb=645175864a613fc539f46ffa4028742aad3b1b30;p=paraslash.git

diff --git a/fd.c b/fd.c
index 978ada45..429960cc 100644
--- a/fd.c
+++ b/fd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -25,22 +25,21 @@
  * \param buf The buffer to be sent.
  * \param len The length of \a buf.
  *
- * \return Standard. In any case, the number of bytes that have been written is
- * stored in \a len.
+ * \return Standard.
  */
-int write_all(int fd, const char *buf, size_t *len)
+int write_all(int fd, const char *buf, size_t len)
 {
-	size_t total = *len;
+	size_t total = len;
 
 	assert(total);
-	*len = 0;
-	while (*len < total) {
-		int ret = write(fd, buf + *len, total - *len);
+	len = 0;
+	while (len < total) {
+		int ret = write(fd, buf + len, total - len);
 		if (ret == -1)
 			return -ERRNO_TO_PARA_ERROR(errno);
-		*len += ret;
+		len += ret;
 	}
-	return 1;
+	return len;
 }
 
 /**
@@ -97,7 +96,7 @@ int write_nonblock(int fd, const char *buf, size_t len)
  * In any case, \a num_bytes contains the number of bytes that have been
  * successfully read from \a fd (zero if the first readv() call failed with
  * EAGAIN). Note that even if the function returns negative, some data might
- * have been read before the error occured. In this case \a num_bytes is
+ * have been read before the error occurred. In this case \a num_bytes is
  * positive.
  *
  * \sa \ref write_nonblock(), read(2), readv(2).
@@ -446,7 +445,7 @@ int para_chdir(const char *path)
  * \sa getcwd(3).
  *
  */
-int para_opendir(const char *dirname, DIR **dir, int *cwd)
+static int para_opendir(const char *dirname, DIR **dir, int *cwd)
 {
 	int ret;
 
@@ -480,7 +479,7 @@ close_cwd:
  *
  * \return Standard.
  */
-int para_fchdir(int fd)
+static int para_fchdir(int fd)
 {
 	if (fchdir(fd) < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
@@ -563,6 +562,9 @@ out:
 int para_munmap(void *start, size_t length)
 {
 	int err;
+
+	if (!start)
+		return 0;
 	if (munmap(start, length) >= 0)
 		return 1;
 	err = errno;