From 39087321811e81e26a1a47d6967df1088dcf0e95 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 19 May 2020 20:47:23 +0100
Subject: style(3p/nix): Final act in the brace-wrapping saga

This last change set was generated by a full clang-tidy run (including
compilation):

    clang-tidy -p ~/projects/nix-build/ \
      -checks=-*,readability-braces-around-statements -fix src/*/*.cc

Actually running clang-tidy requires some massaging to make it play
nice with Nix + meson, I'll be adding a wrapper or something for that soon.
---
 .../src/nix-collect-garbage/nix-collect-garbage.cc   | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'third_party/nix/src/nix-collect-garbage')

diff --git a/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc b/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
index 1b20386ff139..29c68e963716 100644
--- a/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
+++ b/third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc
@@ -42,10 +42,11 @@ void removeOldGenerations(std::string dir) {
       }
       if (link.find("link") != string::npos) {
         LOG(INFO) << "removing old generations of profile " << path;
-        if (deleteOlderThan != "")
+        if (deleteOlderThan != "") {
           deleteGenerationsOlderThan(path, deleteOlderThan, dryRun);
-        else
+        } else {
           deleteOldGenerations(path, dryRun);
+        }
       }
     } else if (type == DT_DIR) {
       removeOldGenerations(path);
@@ -61,22 +62,23 @@ static int _main(int argc, char** argv) {
 
     parseCmdLine(
         argc, argv, [&](Strings::iterator& arg, const Strings::iterator& end) {
-          if (*arg == "--help")
+          if (*arg == "--help") {
             showManPage("nix-collect-garbage");
-          else if (*arg == "--version")
+          } else if (*arg == "--version") {
             printVersion("nix-collect-garbage");
-          else if (*arg == "--delete-old" || *arg == "-d")
+          } else if (*arg == "--delete-old" || *arg == "-d") {
             removeOld = true;
-          else if (*arg == "--delete-older-than") {
+          } else if (*arg == "--delete-older-than") {
             removeOld = true;
             deleteOlderThan = getArg(*arg, arg, end);
-          } else if (*arg == "--dry-run")
+          } else if (*arg == "--dry-run") {
             dryRun = true;
-          else if (*arg == "--max-freed") {
+          } else if (*arg == "--max-freed") {
             long long maxFreed = getIntArg<long long>(*arg, arg, end, true);
             options.maxFreed = maxFreed >= 0 ? maxFreed : 0;
-          } else
+          } else {
             return false;
+          }
           return true;
         });
 
-- 
cgit 1.4.1