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

style(3p/nix): Add braces around single-line conditionals

Browse source 
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
This commit is contained in:
Vincent Ambo 2020-05-19 18:55:58 +01:00
parent c6a31838cd
commit 867055133d
97 changed files with 2223 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/nix/src/nix-collect-garbage/nix-collect-garbage.cc vendored
View file

@ -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) {