Do not specify LDLAGS twice.

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index d41923f0f602b75c20eb7d6bcfec5b779896428d..0b3e88c487d7aa15a65c188af04826e9d13f93ea 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -674,7 +674,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
                if (cd->storage_type == OSL_NO_STORAGE)
                        continue;
                if (!table_dir) {
-                       ret = para_mkdir(desc->dir, 0777);
+                       ret = osl_mkdir(desc->dir, 0777);
                        if (ret < 0 && !is_errno(-ret, EEXIST))
                                goto out;
                        table_dir = make_message("%s/%s", desc->dir,
@@ -682,7 +682,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
                        ret = -ERRNO_TO_ERROR(ENOMEM);
                        if (!table_dir)
                                goto out;
-                       ret = para_mkdir(table_dir, 0777);
+                       ret = osl_mkdir(table_dir, 0777);
                        if (ret < 0)
                                goto out;
                }
@@ -701,7 +701,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
                        continue;
                }
                /* DISK STORAGE */
-               ret = para_mkdir(filename, 0777);
+               ret = osl_mkdir(filename, 0777);
                free(filename);
                if (ret < 0)
                        goto out;
@@ -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;
 }
@@ -1252,7 +1252,7 @@ static int create_disk_storage_object_dir(const struct osl_table *t,
        dirname = disk_storage_dirname(t, col_num, ds_name);
        if (!dirname)
                return -ERRNO_TO_ERROR(ENOMEM);
-       ret = para_mkdir(dirname, 0777);
+       ret = osl_mkdir(dirname, 0777);
        free(dirname);
        if (ret < 0 && !is_errno(-ret, EEXIST))
                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)