Rename para_open() to osl_open().

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index 2970264b342f910152834352321c789a3a513a68..6369ceb5093d9ee5566e015d64a68049f6faa09a 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -176,16 +176,13 @@ static ssize_t write_all(int fd, const void *buf, size_t size)
  * \param buf The buffer to write to the file.
  * \param size The size of \a buf.
  *
- * \return Positive on success, negative on errors. Possible errors include:
- * any errors from para_open() or para_write().
- *
- * \sa para_open(), para_write().
+ * \return Standard.
  */
 static int write_file(const char *filename, const void *buf, size_t size)
 {
        int ret, fd;
 
-       ret = para_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+       ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
        if (ret < 0)
                return ret;
        fd = ret;
@@ -204,7 +201,7 @@ static int append_file(const char *filename, char *header, size_t header_size,
        int ret, fd;
 
 //     DEBUG_LOG("appending %zu  + %zu bytes\n", header_size, data_size);
-       ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
+       ret = osl_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
        if (ret < 0)
                return ret;
        fd = ret;
@@ -230,71 +227,6 @@ out:
        return ret;
 }
 
-/**
- * Traverse the given directory recursively.
- *
- * \param dirname The directory to traverse.
- * \param func The function to call for each entry.
- * \param private_data Pointer to an arbitrary data structure.
- *
- * For each regular file under \a dirname, the supplied function \a func is
- * called.  The full path of the regular file and the \a private_data pointer
- * are passed to \a func. Directories for which the calling process has no
- * permissions to change to are silently ignored.
- *
- * \return Standard.
- */
-int for_each_file_in_dir(const char *dirname,
-               int (*func)(const char *, void *), void *private_data)
-{
-       DIR *dir;
-       struct dirent *entry;
-       int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
-
-       if (ret < 0)
-               return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
-       /* scan cwd recursively */
-       while ((entry = readdir(dir))) {
-               mode_t m;
-               char *tmp;
-               struct stat s;
-
-               if (!strcmp(entry->d_name, "."))
-                       continue;
-               if (!strcmp(entry->d_name, ".."))
-                       continue;
-               if (lstat(entry->d_name, &s) == -1)
-                       continue;
-               m = s.st_mode;
-               if (!S_ISREG(m) && !S_ISDIR(m))
-                       continue;
-               tmp = make_message("%s/%s", dirname, entry->d_name);
-               ret = -ERRNO_TO_ERROR(ENOMEM);
-               if (!tmp)
-                       goto out;
-               if (!S_ISDIR(m)) {
-                       ret = func(tmp, private_data);
-                       free(tmp);
-                       if (ret < 0)
-                               goto out;
-                       continue;
-               }
-               /* directory */
-               ret = for_each_file_in_dir(tmp, func, private_data);
-               free(tmp);
-               if (ret < 0)
-                       goto out;
-       }
-       ret = 1;
-out:
-       closedir(dir);
-       ret2 = para_fchdir(cwd_fd);
-       if (ret2 < 0 && ret >= 0)
-               ret = ret2;
-       close(cwd_fd);
-       return ret;
-}
-
 static int verify_name(const char *name)
 {
        if (!name)
@@ -761,7 +693,7 @@ int osl_create_table(const struct osl_table_description *desc)
                        goto out;
                INFO_LOG("filename: %s\n", filename);
                if (cd->storage_type == OSL_MAPPED_STORAGE) {
-                       ret = para_open(filename, O_RDWR | O_CREAT | O_EXCL,
+                       ret = osl_open(filename, O_RDWR | O_CREAT | O_EXCL,
                                0644);
                        free(filename);
                        if (ret < 0)