From 867055133d3f487e52dd44149f76347c2c28bf10 Mon Sep 17 00:00:00 2001 From: Vincent Ambo 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 --- .../nix/src/nix-collect-garbage/nix-collect-garbage.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 ac6565203619..1b20386ff139 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 @@ -19,7 +19,9 @@ bool dryRun = false; * impossible. */ void removeOldGenerations(std::string dir) { - if (access(dir.c_str(), R_OK) != 0) return; + if (access(dir.c_str(), R_OK) != 0) { + return; + } bool canWrite = access(dir.c_str(), W_OK) == 0; @@ -34,7 +36,9 @@ void removeOldGenerations(std::string dir) { try { link = readLink(path); } catch (SysError& e) { - if (e.errNo == ENOENT) continue; + if (e.errNo == ENOENT) { + continue; + } } if (link.find("link") != string::npos) { LOG(INFO) << "removing old generations of profile " << path; @@ -79,7 +83,9 @@ static int _main(int argc, char** argv) { initPlugins(); auto profilesDir = settings.nixStateDir + "/profiles"; - if (removeOld) removeOldGenerations(profilesDir); + if (removeOld) { + removeOldGenerations(profilesDir); + } // Run the actual garbage collector. if (!dryRun) { -- cgit 1.4.1