Rename para_munmap() to osl_munmap().

diff --git a/fd.c b/fd.c
index 95976d6817fba4e6571f4a2ac3eab3673af18353..84877602f943ee5893caaaab9db93b1292ccbab8 100644 (file)
--- a/fd.c
+++ b/fd.c
@@ -212,7 +212,7 @@ out:
  *
  * \sa munmap(2), mmap_full_file().
  */
  *
  * \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)
 {
        int err;
        if (munmap(start, length) >= 0)

diff --git a/fd.h b/fd.h
index bb09eb3eb3d0ecafd1a71cc49c579b5e8a0f7c1f..0ca272d45ab733fb3bddad8eb187d24c41201c88 100644 (file)
--- 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_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).
 
 /**
  * A wrapper for mkdir(2).

diff --git a/osl.c b/osl.c
index 0c43801c4d7c27deecfa985d1788008822efe424..0b3e88c487d7aa15a65c188af04826e9d13f93ea 100644 (file)
--- 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;
        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;
 }
        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.
  *
  *
  * \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)
 {
  */
 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);
                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;
        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;
 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;
        }
                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;
 }
        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)
 {
 
 __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)
 }
 
 __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)