X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fd.c;h=2e05313ea26ece1fd65315e80561fdd626f45fe1;hp=978ada45de9211dc84363874682603d0d6d6e558;hb=0cbd0ac87ebe208b0d47df28e86c16886bdb687d;hpb=6b44f1fdf5fdfd18b9f77a87428a971eef0c547e

diff --git a/fd.c b/fd.c
index 978ada45..2e05313e 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.
  */
@@ -97,7 +97,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 +446,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 +480,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 +563,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;