X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=fd.c;h=13708ac64f3e4b490703408dd371fcd504eb5f43;hb=57b98a922b02c22d27ab69cbdcd3e2f028f4447e;hp=c7c4f0f203a3ea2b39657b2345fe2049d9bc414a;hpb=5952112a37ecdaedf3b76e08f97d307f1056c512;p=osl.git

diff --git a/fd.c b/fd.c
index c7c4f0f..13708ac 100644
--- a/fd.c
+++ b/fd.c
@@ -13,6 +13,7 @@
 #include <sys/select.h>
 
 #include "log.h"
+#include "osl.h"
 #include "error.h"
 
 /**
@@ -54,7 +55,7 @@ int write_all(int fd, const char *buf, size_t *len)
  *
  * \sa open(2).
  */
-int para_open(const char *path, int flags, mode_t mode)
+int osl_open(const char *path, int flags, mode_t mode)
 {
 	int ret = open(path, flags, mode);
 
@@ -108,7 +109,7 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd)
 	int ret;
 
 	if (cwd) {
-		ret = para_open(".", O_RDONLY, 0);
+		ret = osl_open(".", O_RDONLY, 0);
 		if (ret < 0)
 			return ret;
 		*cwd = ret;
@@ -173,7 +174,7 @@ int para_mkdir(const char *path, mode_t mode)
  *
  * \return Standard.
  *
- * \sa para_open(), mmap(2).
+ * \sa osl_open(), mmap(2).
  */
 int mmap_full_file(const char *path, int open_mode, void **map,
 		size_t *size, int *fd_ptr)
@@ -188,7 +189,7 @@ int mmap_full_file(const char *path, int open_mode, void **map,
 		mmap_prot = PROT_READ | PROT_WRITE;
 		mmap_flags = MAP_SHARED;
 	}
-	ret = para_open(path, open_mode, 0);
+	ret = osl_open(path, open_mode, 0);
 	if (ret < 0)
 		return ret;
 	fd = ret;
@@ -197,14 +198,14 @@ int mmap_full_file(const char *path, int open_mode, void **map,
 		goto out;
 	}
 	*size = file_status.st_size;
-	ret = -E_EMPTY;
+	ret = -E_OSL_EMPTY;
 	DEBUG_LOG("%s: size %zu\n", path, *size);
 	if (!*size)
 		goto out;
 	*map = mmap(NULL, *size, mmap_prot, mmap_flags, fd, 0);
 	if (*map == MAP_FAILED) {
 		*map = NULL;
-		ret = -E_MMAP;
+		ret = -E_OSL_MMAP;
 		goto out;
 	}
 	ret = 1;