lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Organize and format code a bit

Browse source
This commit is contained in:
John Ericson 2020-08-04 22:28:10 +00:00
parent 45b6fdb22b
commit 1dfcbebc95
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/remote-store.cc
View file

@ -31,7 +31,6 @@ template<> StorePathSet readStorePaths(const Store & store, Source & from)
return paths;
}
void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths)
{
out << paths.size();
@ -39,11 +38,6 @@ void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths
out << store.printStorePath(i);
}
StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
{
auto path = readString(from);
return store.parseStorePath(path);
}
StorePathCAMap readStorePathCAMap(const Store & store, Source & from)
{
@ -63,10 +57,17 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
}
}
StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
{
auto path = readString(from);
return store.parseStorePath(path);
}
void write(const Store & store, Sink & out, const StorePath & storePath)
{
auto path = store.printStorePath(storePath);
out << path;
auto path = store.printStorePath(storePath);
out << path;
}

16
src/libstore/store-api.cc
View file

@ -362,14 +362,14 @@ bool Store::PathInfoCacheValue::isKnownNow()
}
OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path) {
auto resp = queryDerivationOutputMap(path);
OutputPathMap result;
for (auto & [outName, optOutPath] : resp) {
if (!optOutPath)
throw Error("output '%s' has no store path mapped to it", outName);
result.insert_or_assign(outName, *optOutPath);
}
return result;
auto resp = queryDerivationOutputMap(path);
OutputPathMap result;
for (auto & [outName, optOutPath] : resp) {
if (!optOutPath)
throw Error("output '%s' has no store path mapped to it", outName);
result.insert_or_assign(outName, *optOutPath);
}
return result;
}
StorePathSet Store::queryDerivationOutputs(const StorePath & path)