tree-wide: replace readdir_r() with readdir()

Signed-off-by: Christian Brauner <cbrauner@suse.de>

diff --git a/src/lxc/bdev/lxcloop.c b/src/lxc/bdev/lxcloop.c
index c17483f4df10e14c25d5ae46e32d8e247641f424..b322002df5c0c5ccc854532330522de515cd7c1c 100644 (file)
--- a/src/lxc/bdev/lxcloop.c
+++ b/src/lxc/bdev/lxcloop.c
@@ -269,7 +269,7 @@ static int do_loop_create(const char *path, uint64_t size, const char *fstype)
 
 static int find_free_loopdev_no_control(int *retfd, char *namep)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        struct loop_info64 lo;
        DIR *dir;
        int fd = -1;
@@ -279,7 +279,7 @@ static int find_free_loopdev_no_control(int *retfd, char *namep)
                SYSERROR("Error opening /dev");
                return -1;
        }
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
 
                if (!direntp)
                        break;

diff --git a/src/lxc/cgroups/cgfs.c b/src/lxc/cgroups/cgfs.c
index 6b2ac7ee1dc2de9da77653bf223a76963ca94548..2d0de0c11293c0c6ec78ae66ab1008f8a9a69525 100644 (file)
--- a/src/lxc/cgroups/cgfs.c
+++ b/src/lxc/cgroups/cgfs.c
@@ -157,7 +157,7 @@ static struct cgroup_ops cgfs_ops;
 
 static int cgroup_rmdir(char *dirname)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        int saved_errno = 0;
        DIR *dir;
        int ret, failed=0;
@@ -169,7 +169,7 @@ static int cgroup_rmdir(char *dirname)
                return -1;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                struct stat mystat;
                int rc;
 
@@ -2067,26 +2067,14 @@ out:
 static int cgroup_recursive_task_count(const char *cgroup_path)
 {
        DIR *d;
-       struct dirent *dent_buf;
        struct dirent *dent;
-       ssize_t name_max;
        int n = 0, r;
 
-       /* see man readdir_r(3) */
-       name_max = pathconf(cgroup_path, _PC_NAME_MAX);
-       if (name_max <= 0)
-               name_max = 255;
-       dent_buf = malloc(offsetof(struct dirent, d_name) + name_max + 1);
-       if (!dent_buf)
-               return -1;
-
        d = opendir(cgroup_path);
-       if (!d) {
-               free(dent_buf);
+       if (!d)
                return 0;
-       }
 
-       while (readdir_r(d, dent_buf, &dent) == 0 && dent) {
+       while ((dent = readdir(d))) {
                const char *parts[3] = {
                        cgroup_path,
                        dent->d_name,
@@ -2100,13 +2088,11 @@ static int cgroup_recursive_task_count(const char *cgroup_path)
                sub_path = lxc_string_join("/", parts, false);
                if (!sub_path) {
                        closedir(d);
-                       free(dent_buf);
                        return -1;
                }
                r = stat(sub_path, &st);
                if (r < 0) {
                        closedir(d);
-                       free(dent_buf);
                        free(sub_path);
                        return -1;
                }
@@ -2122,7 +2108,6 @@ static int cgroup_recursive_task_count(const char *cgroup_path)
                free(sub_path);
        }
        closedir(d);
-       free(dent_buf);
 
        return n;
 }

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 27c2721033f0ba82249a6a1692779346f700f15e..95f29cad11316bc4cef90be712901bf504e67b28 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -907,7 +907,7 @@ static char *must_make_path(const char *first, ...)
 
 static int cgroup_rmdir(char *dirname)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        DIR *dir;
        int r = 0;
 
@@ -915,7 +915,7 @@ static int cgroup_rmdir(char *dirname)
        if (!dir)
                return -1;
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                struct stat mystat;
                char *pathname;
 
@@ -1367,7 +1367,7 @@ bad:
 
 static int recursive_count_nrtasks(char *dirname)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        DIR *dir;
        int count = 0, ret;
        char *path;
@@ -1376,7 +1376,7 @@ static int recursive_count_nrtasks(char *dirname)
        if (!dir)
                return 0;
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                struct stat mystat;
 
                if (!direntp)

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 9fea9934aa59802d5c3d5261e62bb6806665bd5d..4ece410e9decfea8d37ea8d8f2cf9324fd96640d 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -510,7 +510,7 @@ out:
 static int mount_rootfs_file(const char *rootfs, const char *target,
                                             const char *options)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        struct loop_info64 loinfo;
        int ret = -1, fd = -1, rc;
        DIR *dir;
@@ -522,7 +522,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target,
                return -1;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
 
                if (!direntp)
                        break;

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index db89caaff5e5bbea65ed262d7958b77091ec451e..5ce2dc478781e20431f269aea4e2ca07bf8ea35c 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1805,7 +1805,7 @@ int append_unexp_config_line(const char *line, struct lxc_conf *conf)
 
 static int do_includedir(const char *dirp, struct lxc_conf *lxc_conf)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        DIR *dir;
        char path[MAXPATHLEN];
        int ret = -1, len;
@@ -1816,7 +1816,7 @@ static int do_includedir(const char *dirp, struct lxc_conf *lxc_conf)
                return -1;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                const char *fnam;
                if (!direntp)
                        break;

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 24ded6f3dc0d51801214374dd3829be0e45401c4..ae0286fdd99546b25ea357a4257959d6dc7d4e7f 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -623,7 +623,7 @@ WRAP_API_1(bool, wait_on_daemonized_start, int)
 
 static bool am_single_threaded(void)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        DIR *dir;
        int count=0;
 
@@ -633,7 +633,7 @@ static bool am_single_threaded(void)
                return false;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
 
@@ -2284,7 +2284,7 @@ out:
 static bool has_snapshots(struct lxc_container *c)
 {
        char path[MAXPATHLEN];
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        int count=0;
        DIR *dir;
 
@@ -2293,7 +2293,7 @@ static bool has_snapshots(struct lxc_container *c)
        dir = opendir(path);
        if (!dir)
                return false;
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
 
@@ -3503,7 +3503,7 @@ static int do_lxcapi_snapshot_list(struct lxc_container *c, struct lxc_snapshot
 {
        char snappath[MAXPATHLEN], path2[MAXPATHLEN];
        int count = 0, ret;
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        struct lxc_snapshot *snaps =NULL, *nsnaps;
        DIR *dir;
 
@@ -3520,7 +3520,7 @@ static int do_lxcapi_snapshot_list(struct lxc_container *c, struct lxc_snapshot
                return 0;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
 
@@ -3666,7 +3666,7 @@ err:
 static bool remove_all_snapshots(const char *path)
 {
        DIR *dir;
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        bool bret = true;
 
        dir = opendir(path);
@@ -3674,7 +3674,7 @@ static bool remove_all_snapshots(const char *path)
                SYSERROR("opendir on snapshot path %s", path);
                return false;
        }
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
                if (!strcmp(direntp->d_name, "."))
@@ -4191,7 +4191,7 @@ int list_defined_containers(const char *lxcpath, char ***names, struct lxc_conta
 {
        DIR *dir;
        int i, cfound = 0, nfound = 0;
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        struct lxc_container *c;
 
        if (!lxcpath)
@@ -4208,7 +4208,7 @@ int list_defined_containers(const char *lxcpath, char ***names, struct lxc_conta
        if (names)
                *names = NULL;
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
 

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 1ce9903ed80aa81e65437adc2749b3e7e7a2c973..2411626de932f0fe075eb00de84e48265b3eebff 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -209,7 +209,7 @@ static int match_fd(int fd)
  */
 int lxc_check_inherited(struct lxc_conf *conf, bool closeall, int fd_to_ignore)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        int fd, fddir;
        DIR *dir;
 
@@ -225,7 +225,7 @@ restart:
 
        fddir = dirfd(dir);
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                if (!direntp)
                        break;
 

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 614add5363d12dc88487f42acbe95e50eea407ee..27362daa31c682d6c610b02c0047fa3b3d81ee92 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -90,7 +90,7 @@ extern bool btrfs_try_remove_subvol(const char *path);
 static int _recursive_rmdir(char *dirname, dev_t pdev,
                            const char *exclude, int level, bool onedev)
 {
-       struct dirent dirent, *direntp;
+       struct dirent *direntp;
        DIR *dir;
        int ret, failed=0;
        char pathname[MAXPATHLEN];
@@ -102,7 +102,7 @@ static int _recursive_rmdir(char *dirname, dev_t pdev,
                return -1;
        }
 
-       while (!readdir_r(dir, &dirent, &direntp)) {
+       while ((direntp = readdir(dir))) {
                struct stat mystat;
                int rc;