aboutsummaryrefslogtreecommitdiff
path: root/src/libmain
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-27 11:09:07 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-27 11:09:07 -0400
commite94806d03098f1d6e654542500bbea1eaa0ec60b (patch)
tree4e967f3d39a984d86bb93849d76cab92512a07ce /src/libmain
parent9c2decaa1935ae4bf99a9b723d4eab188f8f88ef (diff)
parenta9e6752bbd888ab8fbc1cda6e4d539b2858c4cef (diff)
Merge branch 'master' into no-manifests
Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/shared.cc10
-rw-r--r--src/libmain/shared.hh1
2 files changed, 0 insertions, 11 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index e1280911b..5f92c3df3 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -33,16 +33,6 @@ static void sigintHandler(int signo)
}
-Path makeRootName(const Path & gcRoot, int & counter)
-{
- counter++;
- if (counter == 1)
- return gcRoot;
- else
- return (format("%1%-%2%") % gcRoot % counter).str();
-}
-
-
void printGCWarning()
{
static bool haveWarned = false;
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index 7849e10e3..c69879a12 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -26,7 +26,6 @@ MakeError(UsageError, nix::Error);
class StoreAPI;
/* Ugh. No better place to put this. */
-Path makeRootName(const Path & gcRoot, int & counter);
void printGCWarning();
void printMissing(StoreAPI & store, const PathSet & paths);