diff options
author | Kane York <kanepyork@gmail.com> | 2020-08-02T00·17-0700 |
---|---|---|
committer | kanepyork <rikingcoding@gmail.com> | 2020-08-08T22·16+0000 |
commit | 1de00e6c42ee6beaaa490104888ef09be1d4a0d4 (patch) | |
tree | d98a37ae13525510e3b76feed56b3865360374d1 /third_party/nix/src/nix | |
parent | 053a1380023591e8eb3f514b4214226c95da207d (diff) |
chore(3p/nix): apply google-readability-casting r/1619
Command run: jq <compile_commands.json -r 'map(.file)|.[]' | grep -v '/generated/' | parallel clang-tidy -p compile_commands.json -checks=-*,google-readability-casting --fix Manual fixes applied in src/nix-env/nix-env.cc, src/libstore/store-api.cc Change-Id: I406b4be9368c557ca59329bf6f7002704e955f8d Reviewed-on: https://cl.tvl.fyi/c/depot/+/1557 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/nix/src/nix')
-rw-r--r-- | third_party/nix/src/nix/main.cc | 3 | ||||
-rw-r--r-- | third_party/nix/src/nix/path-info.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/nix/repl.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/nix/search.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/nix/verify.cc | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/third_party/nix/src/nix/main.cc b/third_party/nix/src/nix/main.cc index 9ae06bc803..08390fd24b 100644 --- a/third_party/nix/src/nix/main.cc +++ b/third_party/nix/src/nix/main.cc @@ -38,7 +38,8 @@ static bool haveInternet() { continue; } if (i->ifa_addr->sa_family == AF_INET) { - if (ntohl(((sockaddr_in*)i->ifa_addr)->sin_addr.s_addr) != + if (ntohl( + (reinterpret_cast<sockaddr_in*>(i->ifa_addr))->sin_addr.s_addr) != INADDR_LOOPBACK) { return true; } diff --git a/third_party/nix/src/nix/path-info.cc b/third_party/nix/src/nix/path-info.cc index dca08b06ad..300a588a2e 100644 --- a/third_party/nix/src/nix/path-info.cc +++ b/third_party/nix/src/nix/path-info.cc @@ -96,7 +96,9 @@ struct CmdPathInfo final : StorePathsCommand, MixJSON { if (showSize || showClosureSize || showSigs) { std::cout << std::string( - std::max(0, (int)pathLen - (int)storePath.size()), ' '); + std::max(0, static_cast<int>(pathLen) - + static_cast<int>(storePath.size())), + ' '); } if (showSize) { diff --git a/third_party/nix/src/nix/repl.cc b/third_party/nix/src/nix/repl.cc index 7644b7b8c2..281b3c1e45 100644 --- a/third_party/nix/src/nix/repl.cc +++ b/third_party/nix/src/nix/repl.cc @@ -194,7 +194,7 @@ static int listPossibleCallback(char* s, char*** avp) { return p; }; - vp = check((char**)malloc(possible.size() * sizeof(char*))); + vp = check(static_cast<char**>(malloc(possible.size() * sizeof(char*)))); for (auto& p : possible) { vp[ac++] = check(strdup(p.c_str())); @@ -626,7 +626,7 @@ void NixRepl::addVarToScope(const Symbol& name, Value& v) { } staticEnv.vars[name] = displ; env->values[displ++] = &v; - varNames.insert((std::string)name); + varNames.insert(std::string(name)); } Expr* NixRepl::parseString(const std::string& s) { diff --git a/third_party/nix/src/nix/search.cc b/third_party/nix/src/nix/search.cc index 2bfdeac6f7..06d5c207e5 100644 --- a/third_party/nix/src/nix/search.cc +++ b/third_party/nix/src/nix/search.cc @@ -196,8 +196,8 @@ struct CmdSearch final : SourceExprCommand, MixJSON { : nullptr; doExpr(i.second.value, attrPath.empty() - ? (std::string)i.second.name - : attrPath + "." + (std::string)i.second.name, + ? std::string(i.second.name) + : attrPath + "." + std::string(i.second.name), toplevel2 || fromCache, cache2 ? cache2.get() : nullptr); } } diff --git a/third_party/nix/src/nix/verify.cc b/third_party/nix/src/nix/verify.cc index a9959d50de..6552e3d1a7 100644 --- a/third_party/nix/src/nix/verify.cc +++ b/third_party/nix/src/nix/verify.cc @@ -99,7 +99,8 @@ struct CmdVerify final : StorePathsCommand { } else { StringSet sigsSeen; - size_t actualSigsNeeded = std::max(sigsNeeded, (size_t)1); + size_t actualSigsNeeded = + std::max(sigsNeeded, static_cast<size_t>(1)); size_t validSigs = 0; auto doSigs = [&](const StringSet& sigs) { |