From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 19 Dec 2013 10:25:08 +0000 (+0100)
Subject: core: replace readdir_r with readdir
X-Git-Tag: v209~750
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9fa3006323e86962ceaa3171b906cf2b1c2cf525;hp=66c7a5332a9ef33143ab57f5f0d1cff0dc4d6ac5

core: replace readdir_r with readdir
---

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index a877e6609..35040090a 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -63,12 +63,13 @@ static int iterate_dir(
 
         for (;;) {
                 struct dirent *de;
-                union dirent_storage buf;
                 _cleanup_free_ char *f = NULL;
                 int k;
 
-                k = readdir_r(d, &buf.de, &de);
-                if (k != 0) {
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0) {
+                        k = errno;
                         log_error("Failed to read directory %s: %s", path, strerror(k));
                         return -k;
                 }