maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): apply all clang-tidy fixes

Browse source 
Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-24 21:09:44 -07:00 • committed by kanepyork
parent 69f402563a
commit ef54f5da9f
65 changed files with 580 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

26
third_party/nix/src/nix-store/nix-store.cc vendored
View file

@ -155,8 +155,8 @@ static void opRealise(Strings opFlags, Strings opArgs) {
store->followLinksToStorePath(p.first), p.second));
}
unsigned long long downloadSize;
unsigned long long narSize;
unsigned long long downloadSize = 0;
unsigned long long narSize = 0;
PathSet willBuild;
PathSet willSubstitute;
PathSet unknown;
@ -959,9 +959,9 @@ static void opServe(Strings opFlags, Strings opArgs) {
};
while (true) {
ServeCommand cmd;
ServeCommand cmd{};
try {
cmd = (ServeCommand)readInt(in);
cmd = static_cast<ServeCommand>(readInt(in));
} catch (EndOfFile& e) {
break;
}
@ -988,8 +988,8 @@ static void opServe(Strings opFlags, Strings opArgs) {
paths2.insert(path);
}
}
unsigned long long downloadSize;
unsigned long long narSize;
unsigned long long downloadSize = 0;
unsigned long long narSize = 0;
PathSet willBuild;
PathSet willSubstitute;
PathSet unknown;
@ -1170,13 +1170,15 @@ static void opGenerateBinaryCacheKey(Strings opFlags, Strings opArgs) {
throw Error("key generation failed");
}
writeFile(publicKeyFile, keyName + ":" +
absl::Base64Escape(std::string(
(char*)pk, crypto_sign_PUBLICKEYBYTES)));
writeFile(publicKeyFile,
keyName + ":" +
absl::Base64Escape(std::string(reinterpret_cast<char*>(pk),
crypto_sign_PUBLICKEYBYTES)));
umask(0077);
writeFile(secretKeyFile, keyName + ":" +
absl::Base64Escape(std::string(
(char*)sk, crypto_sign_SECRETKEYBYTES)));
writeFile(secretKeyFile,
keyName + ":" +
absl::Base64Escape(std::string(reinterpret_cast<char*>(sk),
crypto_sign_SECRETKEYBYTES)));
#else
throw Error(
"Nix was not compiled with libsodium, required for signed binary cache "