maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AutoCloseDir: Use std::unique_ptr

Browse source
This commit is contained in:
Eelco Dolstra 2017-01-16 22:39:27 +01:00
parent 2b9d0a99cb
commit 8079ab87a2
4 changed files with 20 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/optimise-store.cc
View file

@ -47,11 +47,11 @@ LocalStore::InodeHash LocalStore::loadInodeHash()
debug("loading hash inodes in memory");
InodeHash inodeHash;
AutoCloseDir dir = opendir(linksDir.c_str());
AutoCloseDir dir(opendir(linksDir.c_str()));
if (!dir) throw SysError(format("opening directory ‘%1%’") % linksDir);
struct dirent * dirent;
while (errno = 0, dirent = readdir(dir)) { /* sic */
while (errno = 0, dirent = readdir(dir.get())) { /* sic */
checkInterrupt();
// We don't care if we hit non-hash files, anything goes
inodeHash.insert(dirent->d_ino);
@ -68,11 +68,11 @@ Strings LocalStore::readDirectoryIgnoringInodes(const Path & path, const InodeHa
{
Strings names;
AutoCloseDir dir = opendir(path.c_str());
AutoCloseDir dir(opendir(path.c_str()));
if (!dir) throw SysError(format("opening directory ‘%1%’") % path);
struct dirent * dirent;
while (errno = 0, dirent = readdir(dir)) { /* sic */
while (errno = 0, dirent = readdir(dir.get())) { /* sic */
checkInterrupt();
if (inodeHash.count(dirent->d_ino)) {