diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-01T22·32-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-01T22·45+0000 |
| commit | 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 (patch) | |
| tree | eacd58ae5e0de9ffaadc265b8fd417f2f62d0433 /third_party/nix/src/nix-store/nix-store.cc | |
| parent | cc3c45f739133162c840d500c0d633f46a524e06 (diff) | |
fix(3p/nix): revert "apply all clang-tidy fixes" r/1534
This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. Resolved conflicts: third_party/nix/src/libexpr/eval.cc third_party/nix/src/libstore/builtins/fetchurl.cc third_party/nix/src/libstore/references.cc third_party/nix/src/libutil/hash.cc third_party/nix/src/nix-daemon/nix-daemon.cc Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nix/src/nix-store/nix-store.cc')
| -rw-r--r-- | third_party/nix/src/nix-store/nix-store.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/third_party/nix/src/nix-store/nix-store.cc b/third_party/nix/src/nix-store/nix-store.cc index 9f37bfbcac99..df17e5644113 100644 --- a/third_party/nix/src/nix-store/nix-store.cc +++ b/third_party/nix/src/nix-store/nix-store.cc @@ -155,8 +155,8 @@ static void opRealise(Strings opFlags, Strings opArgs) { store->followLinksToStorePath(p.first), p.second)); } - unsigned long long downloadSize = 0; - unsigned long long narSize = 0; + unsigned long long downloadSize; + unsigned long long narSize; PathSet willBuild; PathSet willSubstitute; PathSet unknown; @@ -962,9 +962,9 @@ static void opServe(Strings opFlags, Strings opArgs) { }; while (true) { - ServeCommand cmd{}; + ServeCommand cmd; try { - cmd = static_cast<ServeCommand>(readInt(in)); + cmd = (ServeCommand)readInt(in); } catch (EndOfFile& e) { break; } @@ -991,8 +991,8 @@ static void opServe(Strings opFlags, Strings opArgs) { paths2.insert(path); } } - unsigned long long downloadSize = 0; - unsigned long long narSize = 0; + unsigned long long downloadSize; + unsigned long long narSize; PathSet willBuild; PathSet willSubstitute; PathSet unknown; @@ -1174,15 +1174,13 @@ static void opGenerateBinaryCacheKey(Strings opFlags, Strings opArgs) { throw Error("key generation failed"); } - writeFile(publicKeyFile, - keyName + ":" + - absl::Base64Escape(std::string(reinterpret_cast<char*>(pk), - crypto_sign_PUBLICKEYBYTES))); + writeFile(publicKeyFile, keyName + ":" + + absl::Base64Escape(std::string( + (char*)pk, crypto_sign_PUBLICKEYBYTES))); umask(0077); - writeFile(secretKeyFile, - keyName + ":" + - absl::Base64Escape(std::string(reinterpret_cast<char*>(sk), - crypto_sign_SECRETKEYBYTES))); + writeFile(secretKeyFile, keyName + ":" + + absl::Base64Escape(std::string( + (char*)sk, crypto_sign_SECRETKEYBYTES))); #else throw Error( "Nix was not compiled with libsodium, required for signed binary cache " |