From b0884806fccc7a0b1e489ee57a3fa02e3a16fe84 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 4 Jun 2008 23:25:11 +0200 Subject: [PATCH] Rename para_munmap() to osl_munmap(). --- fd.c | 2 +- fd.h | 2 +- osl.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fd.c b/fd.c index 95976d6..8487760 100644 --- a/fd.c +++ b/fd.c @@ -212,7 +212,7 @@ out: * * \sa munmap(2), mmap_full_file(). */ -int para_munmap(void *start, size_t length) +int osl_munmap(void *start, size_t length) { int err; if (munmap(start, length) >= 0) diff --git a/fd.h b/fd.h index bb09eb3..0ca272d 100644 --- a/fd.h +++ b/fd.h @@ -11,7 +11,7 @@ int para_opendir(const char *dirname, DIR **dir, int *cwd); int para_fchdir(int fd); int mmap_full_file(const char *filename, int open_mode, void **map, size_t *size, int *fd_ptr); -int para_munmap(void *start, size_t length); +int osl_munmap(void *start, size_t length); /** * A wrapper for mkdir(2). diff --git a/osl.c b/osl.c index 0c43801..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; } @@ -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) -- 2.39.2