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/libmain/shared.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/libmain/shared.cc')
| -rw-r--r-- | third_party/nix/src/libmain/shared.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc index 8b1b96140559..b04bd279b95a 100644 --- a/third_party/nix/src/libmain/shared.cc +++ b/third_party/nix/src/libmain/shared.cc @@ -37,8 +37,8 @@ void printGCWarning() { } void printMissing(const ref<Store>& store, const PathSet& paths) { - unsigned long long downloadSize = 0; - unsigned long long narSize = 0; + unsigned long long downloadSize; + unsigned long long narSize; PathSet willBuild; PathSet willSubstitute; PathSet unknown; @@ -128,7 +128,7 @@ void initNix() { startSignalHandlerThread(); /* Reset SIGCHLD to its default. */ - struct sigaction act {}; + struct sigaction act; sigemptyset(&act.sa_mask); act.sa_handler = SIG_DFL; act.sa_flags = 0; @@ -151,7 +151,7 @@ void initNix() { umask(0022); /* Initialise the PRNG. */ - struct timeval tv {}; + struct timeval tv; gettimeofday(&tv, nullptr); srandom(tv.tv_usec); } @@ -327,7 +327,7 @@ RunPager::RunPager() { if (pager == nullptr) { pager = getenv("PAGER"); } - if (pager && (std::string(pager) == "" || std::string(pager) == "cat")) { + if (pager && ((std::string)pager == "" || (std::string)pager == "cat")) { return; } |