diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-12-24 16:03:17 +0100 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-12-24 16:18:47 +0100 |
| commit | 495dfdb16cf4897d92b14a93f3ceec02d59280d4 (patch) | |
| tree | cd41cc51ead2bca1c4f514b35a4979ec1a05a429 /Source/Core/Common/FileUtil.cpp | |
| parent | abfa2971665009468dff40b58971a539ed5f9eec (diff) | |
Common: Replace deprecated readdir_r with readdir
Fixes a warning under recent glibc.
Diffstat (limited to 'Source/Core/Common/FileUtil.cpp')
| -rw-r--r-- | Source/Core/Common/FileUtil.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index e761f3ade1..0ea64160c0 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -464,14 +464,12 @@ FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive) { const std::string virtual_name(TStrToUTF8(ffd.cFileName)); #else - struct dirent dirent, *result = nullptr; - DIR* dirp = opendir(directory.c_str()); if (!dirp) return parent_entry; // non Windows loop - while (!readdir_r(dirp, &dirent, &result) && result) + while (dirent* result = readdir(dirp)) { const std::string virtual_name(result->d_name); #endif @@ -531,13 +529,12 @@ bool DeleteDirRecursively(const std::string& directory) { const std::string virtualName(TStrToUTF8(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 (dirent* result = readdir(dirp)) { const std::string virtualName = result->d_name; #endif @@ -602,12 +599,11 @@ void CopyDir(const std::string& source_path, const std::string& dest_path) { const std::string virtualName(TStrToUTF8(ffd.cFileName)); #else - struct dirent dirent, *result = nullptr; DIR* dirp = opendir(source_path.c_str()); if (!dirp) return; - while (!readdir_r(dirp, &dirent, &result) && result) + while (dirent* result = readdir(dirp)) { const std::string virtualName(result->d_name); #endif |
