From 519e7013be9519113117221e6f00404d8685be51 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 11 Sep 2016 13:02:45 +0900
Subject: Common: readdir_r() is deprecated, switch to readdir().
---
src/common/file_util.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
(limited to 'src/common/file_util.cpp')
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 84fe95c8c8..bc83ab737f 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -457,14 +457,12 @@ bool ForeachDirectoryEntry(unsigned* num_entries_out, const std::string &directo
do {
const std::string virtual_name(Common::UTF16ToUTF8(ffd.cFileName));
#else
- struct dirent dirent, *result = nullptr;
-
DIR *dirp = opendir(directory.c_str());
if (!dirp)
return false;
// non windows loop
- while (!readdir_r(dirp, &dirent, &result) && result) {
+ while (struct dirent* result = readdir(dirp)) {
const std::string virtual_name(result->d_name);
#endif
@@ -560,12 +558,10 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
if (!FileUtil::Exists(source_path)) return;
if (!FileUtil::Exists(dest_path)) FileUtil::CreateFullPath(dest_path);
- struct dirent dirent, *result = nullptr;
DIR *dirp = opendir(source_path.c_str());
if (!dirp) return;
- while (!readdir_r(dirp, &dirent, &result) && result)
- {
+ while (struct dirent* result = readdir(dirp)) {
const std::string virtualName(result->d_name);
// check for "." and ".."
if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
--
cgit v1.2.3-70-g09d2