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/main.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/main.cc')
| -rw-r--r-- | third_party/nix/src/nix/main.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/nix/src/nix/main.cc b/third_party/nix/src/nix/main.cc index fa9ebe37435d..5536aac53298 100644 --- a/third_party/nix/src/nix/main.cc +++ b/third_party/nix/src/nix/main.cc @@ -25,7 +25,7 @@ namespace nix { /* Check if we have a non-loopback/link-local network interface. */ static bool haveInternet() { - struct ifaddrs* addrs = nullptr; + struct ifaddrs* addrs; if (getifaddrs(&addrs) != 0) { return true; @@ -38,8 +38,7 @@ static bool haveInternet() { continue; } if (i->ifa_addr->sa_family == AF_INET) { - if (ntohl( - (reinterpret_cast<sockaddr_in*>(i->ifa_addr))->sin_addr.s_addr) != + if (ntohl(((sockaddr_in*)i->ifa_addr)->sin_addr.s_addr) != INADDR_LOOPBACK) { return true; } |