diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-01T14·37+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-01T15·14+0200 |
commit | daf3f2c11ff467b600473a2fda7bd513aacc1efa (patch) | |
tree | 2f69efd2cff7f7801b16ebe6a8c5b35cccf90065 /src/nix-env/profiles.cc | |
parent | 1c208f2b7ef8ffb5e6d435d703dad83223a67bd6 (diff) |
Make readDirectory() return inode / file type
Diffstat (limited to 'src/nix-env/profiles.cc')
-rw-r--r-- | src/nix-env/profiles.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nix-env/profiles.cc b/src/nix-env/profiles.cc index f7b306890d4c..074a5e8c9db8 100644 --- a/src/nix-env/profiles.cc +++ b/src/nix-env/profiles.cc @@ -42,12 +42,11 @@ Generations findGenerations(Path profile, int & curGen) Path profileDir = dirOf(profile); string profileName = baseNameOf(profile); - Strings names = readDirectory(profileDir); - for (Strings::iterator i = names.begin(); i != names.end(); ++i) { + for (auto & i : readDirectory(profileDir)) { int n; - if ((n = parseName(profileName, *i)) != -1) { + if ((n = parseName(profileName, i.name)) != -1) { Generation gen; - gen.path = profileDir + "/" + *i; + gen.path = profileDir + "/" + i.name; gen.number = n; struct stat st; if (lstat(gen.path.c_str(), &st) != 0) |