From: Kefu Chai <kchai@redhat.com>
Date: Mon, 7 Nov 2016 06:18:23 +0000 (+0800)
Subject: librados_test_stub: use readdir() as readdir_r() is deprecated
X-Git-Tag: v11.1.0~314^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4570ff3c05810fef6ef3a70b79ba4be3777eec5;p=ceph.git

librados_test_stub: use readdir() as readdir_r() is deprecated

see https://lwn.net/Articles/696469/, readdir_r() is deprecated by
glibc since 2.24. so let's use readdir() instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc
index 3d3e5780a8b..1305b7b06bd 100644
--- a/src/test/librados_test_stub/TestClassHandler.cc
+++ b/src/test/librados_test_stub/TestClassHandler.cc
@@ -52,10 +52,8 @@ void TestClassHandler::open_all_classes() {
     assert(false);;
   }
 
-  char buf[offsetof(struct dirent, d_name) + PATH_MAX + 1];
-  struct dirent *pde;
-  int r = 0;
-  while ((r = ::readdir_r(dir, (dirent *)&buf, &pde)) == 0 && pde) {
+  struct dirent *pde = nullptr;
+  while ((pde = ::readdir(dir))) {
     std::string name(pde->d_name);
     if (!boost::algorithm::starts_with(name, "libcls_") ||
         !boost::algorithm::ends_with(name, ".so")) {