aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-14 21:28:50 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-07-14 21:28:50 +0000
commit650c2c655810c375296b52997e2f85298c7c566a (patch)
tree1204a06a9848b6460e4e78f3b07c8cb501152264
parent8173e7bfefc6a5771b2c9ec48bd6edd3b161dd90 (diff)
Rename variable `nar` -> `dump` according to TODO
-rw-r--r--src/libstore/local-store.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 5827dfc58..cd92f138c 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1107,7 +1107,7 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
temporary path. Otherwise, we move it to the destination store
path. */
bool inMemory = true;
- std::string nar; // TODO rename from "nar" to "dump"
+ std::string dump;
auto source = sinkToSource([&](Sink & sink) {
@@ -1115,13 +1115,13 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
(*hashSink)(buf, len);
if (inMemory) {
- if (nar.size() + len > settings.narBufferSize) {
+ if (dump.size() + len > settings.narBufferSize) {
inMemory = false;
sink << 1;
- sink((const unsigned char *) nar.data(), nar.size());
- nar.clear();
+ sink((const unsigned char *) dump.data(), dump.size());
+ dump.clear();
} else {
- nar.append((const char *) buf, len);
+ dump.append((const char *) buf, len);
}
}
@@ -1180,7 +1180,7 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
if (inMemory) {
/* Restore from the NAR in memory. */
- StringSource source(nar);
+ StringSource source(dump);
if (method == FileIngestionMethod::Recursive)
restorePath(realPath, source);
else