From ef54f5da9fa30b5c302f2a49595ee5d041f9706a Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 24 Jul 2020 21:09:44 -0700
Subject: fix(3p/nix): apply all clang-tidy fixes

Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
---
 third_party/nix/src/libmain/shared.cc | 10 +++++-----
 third_party/nix/src/libmain/stack.cc  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'third_party/nix/src/libmain')

diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc
index b04bd279b95a..8b1b96140559 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;
-  unsigned long long narSize;
+  unsigned long long downloadSize = 0;
+  unsigned long long narSize = 0;
   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;
   }
 
diff --git a/third_party/nix/src/libmain/stack.cc b/third_party/nix/src/libmain/stack.cc
index c7744f69c82c..c60a53968f8f 100644
--- a/third_party/nix/src/libmain/stack.cc
+++ b/third_party/nix/src/libmain/stack.cc
@@ -9,14 +9,14 @@
 
 namespace nix {
 
-static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
+static void sigsegvHandler(int _signo, siginfo_t* info, void* ctx) {
   /* Detect stack overflows by comparing the faulting address with
      the stack pointer.  Unfortunately, getting the stack pointer is
      not portable. */
   bool haveSP = true;
   char* sp = nullptr;
 #if defined(__x86_64__) && defined(REG_RSP)
-  sp = (char*)((ucontext_t*)ctx)->uc_mcontext.gregs[REG_RSP];
+  sp = (char*)(static_cast<ucontext_t*>(ctx))->uc_mcontext.gregs[REG_RSP];
 #elif defined(REG_ESP)
   sp = (char*)((ucontext_t*)ctx)->uc_mcontext.gregs[REG_ESP];
 #else
@@ -24,7 +24,7 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
 #endif
 
   if (haveSP) {
-    ptrdiff_t diff = (char*)info->si_addr - sp;
+    ptrdiff_t diff = static_cast<char*>(info->si_addr) - sp;
     if (diff < 0) {
       diff = -diff;
     }
@@ -36,7 +36,7 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
   }
 
   /* Restore default behaviour (i.e. segfault and dump core). */
-  struct sigaction act;
+  struct sigaction act {};
   sigfillset(&act.sa_mask);
   act.sa_handler = SIG_DFL;
   act.sa_flags = 0;
@@ -62,7 +62,7 @@ void detectStackOverflow() {
     throw SysError("cannot set alternative stack");
   }
 
-  struct sigaction act;
+  struct sigaction act {};
   sigfillset(&act.sa_mask);
   act.sa_sigaction = sigsegvHandler;
   act.sa_flags = SA_SIGINFO | SA_ONSTACK;
-- 
cgit 1.4.1