soenkehahn/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-store.cc: Refactor, remove qDefault

Browse source
This commit is contained in:
Robert Hensing 2023-04-03 18:38:11 +02:00
parent fba7be80eb
commit bf2c5c3958
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nix-store/nix-store.cc
View file

@ -277,17 +277,17 @@ static void printTree(const StorePath & path,
static void opQuery(Strings opFlags, Strings opArgs) static void opQuery(Strings opFlags, Strings opArgs)
{ {
enum QueryType enum QueryType
{ qDefault, qOutputs, qRequisites, qReferences, qReferrers { qOutputs, qRequisites, qReferences, qReferrers
, qReferrersClosure, qDeriver, qBinding, qHash, qSize , qReferrersClosure, qDeriver, qBinding, qHash, qSize
, qTree, qGraph, qGraphML, qResolve, qRoots }; , qTree, qGraph, qGraphML, qResolve, qRoots };
QueryType query = qDefault; std::optional<QueryType> query;
bool useOutput = false; bool useOutput = false;
bool includeOutputs = false; bool includeOutputs = false;
bool forceRealise = false; bool forceRealise = false;
std::string bindingName; std::string bindingName;
for (auto & i : opFlags) { for (auto & i : opFlags) {
QueryType prev = query; std::optional<QueryType> prev = query;
if (i == "--outputs") query = qOutputs; if (i == "--outputs") query = qOutputs;
else if (i == "--requisites" || i == "-R") query = qRequisites; else if (i == "--requisites" || i == "-R") query = qRequisites;
else if (i == "--references") query = qReferences; else if (i == "--references") query = qReferences;
@ -312,15 +312,15 @@ static void opQuery(Strings opFlags, Strings opArgs)
else if (i == "--force-realise" || i == "--force-realize" || i == "-f") forceRealise = true; else if (i == "--force-realise" || i == "--force-realize" || i == "-f") forceRealise = true;
else if (i == "--include-outputs") includeOutputs = true; else if (i == "--include-outputs") includeOutputs = true;
else throw UsageError("unknown flag '%1%'", i); else throw UsageError("unknown flag '%1%'", i);
if (prev != qDefault && prev != query) if (prev && prev != query)
throw UsageError("query type '%1%' conflicts with earlier flag", i); throw UsageError("query type '%1%' conflicts with earlier flag", i);
} }
if (query == qDefault) query = qOutputs; if (!query) query = qOutputs;
RunPager pager; RunPager pager;
switch (query) { switch (*query) {
case qOutputs: { case qOutputs: {
for (auto & i : opArgs) { for (auto & i : opArgs) {
@ -443,7 +443,7 @@ static void opQuery(Strings opFlags, Strings opArgs)
break; break;
} }
default: case qDefault: default:
abort(); abort();
} }
} }