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

style(3p/nix): Final act in the brace-wrapping saga

Browse source 
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.
This commit is contained in:
Vincent Ambo 2020-05-19 20:47:23 +01:00
parent cf40d08908
commit 3908732181
84 changed files with 2601 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
});