From 867055133d3f487e52dd44149f76347c2c28bf10 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 19 May 2020 18:55:58 +0100
Subject: style(3p/nix): Add braces around single-line conditionals

These were not caught by the previous clang-tidy invocation, but were
instead sorted out using amber[0] as such:

    ambr --regex 'if (\(.+\))\s([a-z].*;)' 'if $1 { $2 }'

[0]: https://github.com/dalance/amber
---
 third_party/nix/src/libmain/stack.cc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'third_party/nix/src/libmain/stack.cc')

diff --git a/third_party/nix/src/libmain/stack.cc b/third_party/nix/src/libmain/stack.cc
index 39866bb48248..0d5b91c163c7 100644
--- a/third_party/nix/src/libmain/stack.cc
+++ b/third_party/nix/src/libmain/stack.cc
@@ -25,7 +25,9 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
 
   if (haveSP) {
     ptrdiff_t diff = (char*)info->si_addr - sp;
-    if (diff < 0) diff = -diff;
+    if (diff < 0) {
+      diff = -diff;
+    }
     if (diff < 4096) {
       char msg[] = "error: stack overflow (possible infinite recursion)\n";
       [[gnu::unused]] auto res = write(2, msg, strlen(msg));
@@ -38,7 +40,9 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
   sigfillset(&act.sa_mask);
   act.sa_handler = SIG_DFL;
   act.sa_flags = 0;
-  if (sigaction(SIGSEGV, &act, 0)) abort();
+  if (sigaction(SIGSEGV, &act, 0)) {
+    abort();
+  }
 }
 
 void detectStackOverflow() {
@@ -50,7 +54,9 @@ void detectStackOverflow() {
   stack.ss_size = 4096 * 4 + MINSIGSTKSZ;
   static auto stackBuf = std::make_unique<std::vector<char>>(stack.ss_size);
   stack.ss_sp = stackBuf->data();
-  if (!stack.ss_sp) throw Error("cannot allocate alternative stack");
+  if (!stack.ss_sp) {
+    throw Error("cannot allocate alternative stack");
+  }
   stack.ss_flags = 0;
   if (sigaltstack(&stack, 0) == -1)
     throw SysError("cannot set alternative stack");
@@ -59,7 +65,9 @@ void detectStackOverflow() {
   sigfillset(&act.sa_mask);
   act.sa_sigaction = sigsegvHandler;
   act.sa_flags = SA_SIGINFO | SA_ONSTACK;
-  if (sigaction(SIGSEGV, &act, 0)) throw SysError("resetting SIGSEGV");
+  if (sigaction(SIGSEGV, &act, 0)) {
+    throw SysError("resetting SIGSEGV");
+  }
 #endif
 }
 
-- 
cgit 1.4.1