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

delta: replace readdir_r with readdir
---

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 0785e7b5e..a26af02b7 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -280,13 +280,13 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
 
         for (;;) {
                 struct dirent *de;
-                union dirent_storage buf;
                 int k;
                 char *p;
 
-                k = readdir_r(d, &buf.de, &de);
-                if (k != 0)
-                        return -k;
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0)
+                        return -errno;
 
                 if (!de)
                         break;