From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 19 Dec 2013 10:33:09 +0000 (+0100)
Subject: conf-files: replace readdir_r with readdir
X-Git-Tag: v209~745
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a2be63f9223ed1503ffc1e99bf21eee25e4ae014

conf-files: replace readdir_r with readdir
---

diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index 92204a6a0..c86bb0307 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -53,13 +53,13 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
 
         for (;;) {
                 struct dirent *de;
-                union dirent_storage buf;
                 char *p;
                 int r;
 
-                r = readdir_r(dir, &buf.de, &de);
-                if (r != 0)
-                        return -r;
+                errno = 0;
+                de = readdir(dir);
+                if (!de && errno != 0)
+                        return -errno;
 
                 if (!de)
                         break;