procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Simplify resource management in directory iterators

Browse source 
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&&.
This commit is contained in:
Jonathan Wakely 2022-02-08 15:57:58 +00:00
parent d0d4601ccd
commit 1ef6085f09
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/src/c++17/fs_dir.cc
View file

@ -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

2
libstdc++-v3/src/filesystem/dir-common.h
View file

@ -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,

4
libstdc++-v3/src/filesystem/dir.cc
View file

@ -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;