mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-29 17:16:15 +02:00
Fix gcc 12 warnings
This commit is contained in:
parent
90ec015d61
commit
65bb12ba78
5 changed files with 11 additions and 1 deletions
|
@ -123,6 +123,11 @@ struct KeyedBuildResult : BuildResult
|
||||||
* The derivation we built or the store path we substituted.
|
* The derivation we built or the store path we substituted.
|
||||||
*/
|
*/
|
||||||
DerivedPath path;
|
DerivedPath path;
|
||||||
|
|
||||||
|
// Hack to work around a gcc "may be used uninitialized" warning.
|
||||||
|
KeyedBuildResult(BuildResult res, DerivedPath path)
|
||||||
|
: BuildResult(std::move(res)), path(std::move(path))
|
||||||
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2480,6 +2480,7 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs()
|
||||||
CanonPath { tmpDir + "/tmp" }).hash;
|
CanonPath { tmpDir + "/tmp" }).hash;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
assert(false);
|
||||||
}();
|
}();
|
||||||
|
|
||||||
ValidPathInfo newInfo0 {
|
ValidPathInfo newInfo0 {
|
||||||
|
|
|
@ -415,6 +415,8 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
|
||||||
// Use NAR; Git is not a serialization method
|
// Use NAR; Git is not a serialization method
|
||||||
dumpMethod = FileSerialisationMethod::Recursive;
|
dumpMethod = FileSerialisationMethod::Recursive;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
// TODO these two steps are essentially RemoteStore::addCAToStore. Move it up to Store.
|
// TODO these two steps are essentially RemoteStore::addCAToStore. Move it up to Store.
|
||||||
auto path = store->addToStoreFromDump(source, name, dumpMethod, contentAddressMethod, hashAlgo, refs, repair);
|
auto path = store->addToStoreFromDump(source, name, dumpMethod, contentAddressMethod, hashAlgo, refs, repair);
|
||||||
|
|
|
@ -527,6 +527,8 @@ StorePath RemoteStore::addToStoreFromDump(
|
||||||
// Use NAR; Git is not a serialization method
|
// Use NAR; Git is not a serialization method
|
||||||
fsm = FileSerialisationMethod::Recursive;
|
fsm = FileSerialisationMethod::Recursive;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
if (fsm != dumpMethod)
|
if (fsm != dumpMethod)
|
||||||
unsupported("RemoteStore::addToStoreFromDump doesn't support this `dumpMethod` `hashMethod` combination");
|
unsupported("RemoteStore::addToStoreFromDump doesn't support this `dumpMethod` `hashMethod` combination");
|
||||||
|
|
|
@ -123,7 +123,7 @@ Hash hashPath(
|
||||||
case FileIngestionMethod::Git:
|
case FileIngestionMethod::Git:
|
||||||
return git::dumpHash(ht, accessor, path, filter).hash;
|
return git::dumpHash(ht, accessor, path, filter).hash;
|
||||||
}
|
}
|
||||||
|
assert(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue