From a72709afd8ffe35613a6bacd698a36395e095a48 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jun 2008 09:34:17 +0000 Subject: * Some refactoring: put the GC options / results in separate structs. * The garbage collector now also prints the number of blocks freed. --- src/libstore/build.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstore/build.cc') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 0664a118a00f..1d624723f92b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -578,17 +578,17 @@ void getOwnership(const Path & path) void deletePathWrapped(const Path & path, - unsigned long long & bytesFreed) + unsigned long long & bytesFreed, unsigned long long & blocksFreed) { try { /* First try to delete it ourselves. */ - deletePath(path, bytesFreed); + deletePath(path, bytesFreed, blocksFreed); } catch (SysError & e) { /* If this failed due to a permission error, then try it with the setuid helper. */ if (haveBuildUsers() && !amPrivileged()) { getOwnership(path); - deletePath(path, bytesFreed); + deletePath(path, bytesFreed, blocksFreed); } else throw; } @@ -597,8 +597,8 @@ void deletePathWrapped(const Path & path, void deletePathWrapped(const Path & path) { - unsigned long long dummy; - deletePathWrapped(path, dummy); + unsigned long long dummy1, dummy2; + deletePathWrapped(path, dummy1, dummy2); } -- cgit 1.4.1