]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
objclass:: use readdir() as readdir_r() is deprecated
authorKefu Chai <kchai@redhat.com>
Mon, 7 Nov 2016 05:53:48 +0000 (13:53 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 7 Nov 2016 06:19:44 +0000 (14:19 +0800)
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>
src/osd/ClassHandler.cc

index 25d1565a139436409daa7c45690bde97b47fefa1..045683b780e0fb07791922b8d8226e39571db6d4 100644 (file)
@@ -48,10 +48,9 @@ int ClassHandler::open_all_classes()
   if (!dir)
     return -errno;
 
-  char buf[offsetof(struct dirent, d_name) + PATH_MAX + 1];
-  struct dirent *pde;
+  struct dirent *pde = nullptr;
   int r = 0;
-  while ((r = ::readdir_r(dir, (dirent *)&buf, &pde)) == 0 && pde) {
+  while ((pde = ::readdir(dir))) {
     if (pde->d_name[0] == '.')
       continue;
     if (strlen(pde->d_name) > sizeof(CLS_PREFIX) - 1 + sizeof(CLS_SUFFIX) - 1 &&