X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=osl.c;h=0b3e88c487d7aa15a65c188af04826e9d13f93ea;hp=5c6f93ed60c2f7b9a1357b1aba92c7a4b827aa4d;hb=b0884806fccc7a0b1e489ee57a3fa02e3a16fe84;hpb=093138ba762b3179f4d0375bbaf4250b9e016289

diff --git a/osl.c b/osl.c
index 5c6f93e..0b3e88c 100644
--- a/osl.c
+++ b/osl.c
@@ -744,7 +744,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num)
 	int ret;
 	if (!map.data)
 		return;
-	ret = para_munmap(map.data, map.size);
+	ret = osl_munmap(map.data, map.size);
 	assert(ret > 0);
 	map.data = NULL;
 }
@@ -757,7 +757,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num)
  *
  * \return Positive on success, negative on errors.
  *
- * \sa map_table(), enum osl_close_flags, para_munmap().
+ * \sa map_table(), enum osl_close_flags, osl_munmap().
  */
 int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 {
@@ -772,7 +772,7 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags)
 		return -E_OSL_NOT_MAPPED;
 	if (flags & OSL_MARK_CLEAN)
 		mark_table_clean(t);
-	ret = para_munmap(t->index_map.data, t->index_map.size);
+	ret = osl_munmap(t->index_map.data, t->index_map.size);
 	if (ret < 0)
 		return ret;
 	t->index_map.data = NULL;
@@ -863,10 +863,10 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
 err:	/* unmap what is already mapped */
 	for (i--; i >= 0; i--) {
 		struct osl_object map = t->columns[i].data_map;
-		para_munmap(map.data, map.size);
+		osl_munmap(map.data, map.size);
 		map.data = NULL;
 	}
-	para_munmap(t->index_map.data, t->index_map.size);
+	osl_munmap(t->index_map.data, t->index_map.size);
 	t->index_map.data = NULL;
 	return ret;
 }
@@ -1713,7 +1713,7 @@ static int rename_disk_storage_objects(struct osl_table *t,
 		if (!old_filename || !new_filename)
 			ret = -ERRNO_TO_ERROR(ENOMEM);
 		else
-			ret = para_rename(old_filename, new_filename);
+			ret = osl_rename(old_filename, new_filename);
 		free(old_filename);
 		free(new_filename);
 		if (ret < 0)
@@ -1839,7 +1839,7 @@ __export int osl_open_disk_object(const struct osl_table *t, const struct osl_ro
 
 __export int osl_close_disk_object(struct osl_object *obj)
 {
-	return para_munmap(obj->data, obj->size);
+	return osl_munmap(obj->data, obj->size);
 }
 
 __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)