mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix): Apply clang-tidy's readability-* fixes

Browse source 
This applies the readability fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
This commit is contained in:
Vincent Ambo 2020-05-20 22:27:37 +01:00
parent d331d3a0b5
commit 689ef502f5
78 changed files with 863 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/build-remote/build-remote.cc vendored
View file

@ -40,7 +40,7 @@ static AutoCloseFD openSlotLock(const Machine& m, unsigned long long slot) {
static bool allSupportedLocally(const std::set<std::string>& requiredFeatures) {
for (auto& feature : requiredFeatures) {
if (!settings.systemFeatures.get().count(feature)) {
if (settings.systemFeatures.get().count(feature) == 0u) {
return false;
}
}
@ -60,7 +60,7 @@ static int _main(int argc, char* argv[]) {
FdSource source(STDIN_FILENO);
/* Read the parent's settings. */
while (readInt(source)) {
while (readInt(source) != 0u) {
auto name = readString(source);
auto value = readString(source);
settings.set(name, value);
@ -106,7 +106,7 @@ static int _main(int argc, char* argv[]) {
auto requiredFeatures = readStrings<std::set<std::string>>(source);
auto canBuildLocally =
amWilling &&
(amWilling != 0u) &&
(neededSystem == settings.thisSystem ||
settings.extraPlatforms.get().count(neededSystem) > 0) &&
allSupportedLocally(requiredFeatures);
@ -196,7 +196,7 @@ static int _main(int argc, char* argv[]) {
if (hasPrefix(bestMachine->storeUri, "ssh://")) {
storeParams["max-connections"] = "1";
storeParams["log-fd"] = "4";
if (bestMachine->sshKey != "") {
if (!bestMachine->sshKey.empty()) {
storeParams["ssh-key"] = bestMachine->sshKey;
}
}