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

unittest_blkdev: 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/common/test_blkdev.cc b/src/test/common/test_blkdev.cc
index b2379eb929c7..33889685eb0d 100644
--- a/src/test/common/test_blkdev.cc
+++ b/src/test/common/test_blkdev.cc
@@ -13,9 +13,7 @@
 
 TEST(blkdev, get_block_device_base) {
   char buf[PATH_MAX*2];
-  char buf2[PATH_MAX*2];
   char buf3[PATH_MAX*2];
-  struct dirent *de, *de2;
 
   ASSERT_EQ(-EINVAL, get_block_device_base("/etc/notindev", buf, 100));
 
@@ -32,9 +30,8 @@ TEST(blkdev, get_block_device_base) {
     sprintf(buf, "%s/sys/block", root.c_str());
     DIR *dir = opendir(buf);
     ASSERT_NE(dir, nullptr);
-    while (!::readdir_r(dir, reinterpret_cast<struct dirent*>(buf), &de)) {
-      if (!de)
-	break;
+    struct dirent *de = nullptr;
+    while ((de = ::readdir(dir))) {
       if (de->d_name[0] == '.')
 	continue;
 
@@ -57,9 +54,8 @@ TEST(blkdev, get_block_device_base) {
       sprintf(subdirfn, "%s/sys/block/%s", root.c_str(), de->d_name);
       DIR *subdir = opendir(subdirfn);
       ASSERT_TRUE(subdir);
-      while (!::readdir_r(subdir, reinterpret_cast<struct dirent*>(buf2), &de2)) {
-	if (!de2)
-	  break;
+      struct dirent *de2 = nullptr;
+      while ((de2 = ::readdir(subdir))) {
 	if (de2->d_name[0] == '.')
 	  continue;
 	// partiions will be prefixed with the base name