maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
This reverts commit ef54f5da9f.

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
This commit is contained in:
Kane York 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libmain/shared.cc vendored
View file

@ -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;
}