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/libstore/remote-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/libstore/remote-store.cc')
| -rw-r--r-- | third_party/nix/src/libstore/remote-store.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/nix/src/libstore/remote-store.cc b/third_party/nix/src/libstore/remote-store.cc index 8d278d500dd5..7c45c5ff515d 100644 --- a/third_party/nix/src/libstore/remote-store.cc +++ b/third_party/nix/src/libstore/remote-store.cc @@ -97,7 +97,7 @@ ref<RemoteStore::Connection> UDSRemoteStore::openConnection() { std::string socketPath = path ? *path : settings.nixDaemonSocketFile; - struct sockaddr_un addr {}; + struct sockaddr_un addr; addr.sun_family = AF_UNIX; strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path)); if (addr.sun_path[sizeof(addr.sun_path) - 1] != '\0') { @@ -347,7 +347,7 @@ void RemoteStore::queryPathInfoUncached( throw; } if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 17) { - bool valid = 0; + bool valid; conn->from >> valid; if (!valid) { throw InvalidPath(format("path '%s' is not valid") % path); @@ -544,9 +544,9 @@ BuildResult RemoteStore::buildDerivation(const Path& drvPath, conn->to << wopBuildDerivation << drvPath << drv << buildMode; conn.processStderr(); BuildResult res; - unsigned int status = 0; + unsigned int status; conn->from >> status >> res.errorMsg; - res.status = static_cast<BuildResult::Status>(status); + res.status = (BuildResult::Status)status; return res; } |