diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-02-08 15:57:58 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-02-08 21:04:14 +0000 |
| commit | 1ef6085f09b50e0aa3e5a5d15ebf8752e8aa8a72 (patch) | |
| tree | 253855afea390880347b9d54c264589da0e6fced | |
| parent | d0d4601ccde3c4849f6e7244035f1a899d608cb7 (diff) | |
| download | gcc-1ef6085f09b50e0aa3e5a5d15ebf8752e8aa8a72.zip gcc-1ef6085f09b50e0aa3e5a5d15ebf8752e8aa8a72.tar.gz gcc-1ef6085f09b50e0aa3e5a5d15ebf8752e8aa8a72.tar.bz2 | |
libstdc++: Simplify resource management in directory iterators
This replaces the _Dir constructor that takes ownership of an existing
DIR* resource with one that takes a _Dir_base rvalue instead. This means
a raw DIR* is never passed around, but is always owned by a _Dir_base
object.
libstdc++-v3/ChangeLog:
* src/c++17/fs_dir.cc (_Dir(DIR*, const path&)): Change first
parameter to _Dir_base&&.
* src/filesystem/dir-common.h (_Dir_base(DIR*)): Remove.
* src/filesystem/dir.cc (_Dir(DIR*, const path&)): Change first
parameter to _Dir_base&&.
| -rw-r--r-- | libstdc++-v3/src/c++17/fs_dir.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/dir-common.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/dir.cc | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libstdc++-v3/src/c++17/fs_dir.cc b/libstdc++-v3/src/c++17/fs_dir.cc index 54f135d..c67fe76 100644 --- a/libstdc++-v3/src/c++17/fs_dir.cc +++ b/libstdc++-v3/src/c++17/fs_dir.cc @@ -57,7 +57,7 @@ struct fs::_Dir : _Dir_base path = p; } - _Dir(posix::DIR* dirp, const path& p) : _Dir_base(dirp), path(p) { } + _Dir(_Dir_base&& d, const path& p) : _Dir_base(std::move(d)), path(p) { } _Dir(_Dir&&) = default; @@ -140,7 +140,7 @@ struct fs::_Dir : _Dir_base _Dir_base d(dirfd, pathname, skip_permission_denied, nofollow, ec); // If this->path is empty, the new _Dir should have an empty path too. const fs::path& p = this->path.empty() ? this->path : this->entry.path(); - return _Dir(std::exchange(d.dirp, nullptr), p); + return _Dir(std::move(d), p); } bool diff --git a/libstdc++-v3/src/filesystem/dir-common.h b/libstdc++-v3/src/filesystem/dir-common.h index 0b7665a..511b988 100644 --- a/libstdc++-v3/src/filesystem/dir-common.h +++ b/libstdc++-v3/src/filesystem/dir-common.h @@ -89,8 +89,6 @@ is_permission_denied_error(int e) struct _Dir_base { - _Dir_base(posix::DIR* dirp = nullptr) : dirp(dirp) { } - // If no error occurs then dirp is non-null, // otherwise null (even if a permission denied error is ignored). _Dir_base(int fd, const posix::char_type* pathname, diff --git a/libstdc++-v3/src/filesystem/dir.cc b/libstdc++-v3/src/filesystem/dir.cc index e838b4b..b451902 100644 --- a/libstdc++-v3/src/filesystem/dir.cc +++ b/libstdc++-v3/src/filesystem/dir.cc @@ -59,7 +59,7 @@ struct fs::_Dir : std::filesystem::_Dir_base path = p; } - _Dir(posix::DIR* dirp, const path& p) : _Dir_base(dirp), path(p) { } + _Dir(_Dir_base&& d, const path& p) : _Dir_base(std::move(d)), path(p) { } _Dir(_Dir&&) = default; @@ -133,7 +133,7 @@ struct fs::_Dir : std::filesystem::_Dir_base { auto [dirfd, pathname] = dir_and_pathname(); _Dir_base d(dirfd, pathname, skip_permission_denied, nofollow, ec); - return _Dir(std::exchange(d.dirp, nullptr), entry.path()); + return _Dir(std::move(d), entry.path()); } fs::path path; |