wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 22:01:15 +02:00
Code Activity

* Move parseHash16or32 into libutil, and use in nix-hash.

Browse source
This commit is contained in:
Eelco Dolstra 2011-12-02 11:47:06 +00:00
parent b12b21825c
commit 49f59dceca
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/nix-hash/nix-hash.cc
View file

@ -43,7 +43,7 @@ void run(Strings args)
}
if (op == opHash) {
for (Strings::iterator i = ss.begin(); i != ss.end(); ++i) {
foreach (Strings::iterator, i, ss) {
Hash h = flat ? hashFile(ht, *i) : hashPath(ht, *i).first;
if (truncate && h.hashSize > 20) h = compressHash(h, 20);
std::cout << format("%1%\n") %
@ -52,8 +52,8 @@ void run(Strings args)
}
else {
for (Strings::iterator i = ss.begin(); i != ss.end(); ++i) {
Hash h = op == opTo16 ? parseHash32(ht, *i) : parseHash(ht, *i);
foreach (Strings::iterator, i, ss) {
Hash h = parseHash16or32(ht, *i);
std::cout << format("%1%\n") %
(op == opTo16 ? printHash(h) : printHash32(h));
}