Rename para_rename() and move it to fd.h.

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index c0e70cf4ce310468058b82481dea8045b3853ef2..0c43801c4d7c27deecfa985d1788008822efe424 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -57,6 +57,7 @@ static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ..
                        free(p);
                        return NULL;
                }
+               p = q;
        }
        return p;
 }
@@ -673,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,
@@ -681,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;
                }
@@ -700,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;
@@ -1251,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;
@@ -1712,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)