diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-16T21·39+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-16T21·39+0100 |
| commit | 8079ab87a2a7cd288a35334517da7a808af8e1e0 (patch) | |
| tree | 011aa471421d7d51033077994464ecdd3fe9a1eb /src/libstore/optimise-store.cc | |
| parent | 2b9d0a99cbf7649c20492bc539e2823a2d2e57c5 (diff) | |
AutoCloseDir: Use std::unique_ptr
Diffstat (limited to 'src/libstore/optimise-store.cc')
| -rw-r--r-- | src/libstore/optimise-store.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 454c8b49d84b..b71c7e905ff1 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -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)) { |