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/libstore/pathlocks.cc vendored
View file

@ -57,8 +57,12 @@ bool lockFile(int fd, LockType lockType, bool wait) {
} else {
while (flock(fd, type | LOCK_NB) != 0) {
checkInterrupt();
if (errno == EWOULDBLOCK) return false;
if (errno != EINTR) throw SysError(format("acquiring/releasing lock"));
if (errno == EWOULDBLOCK) {
return false;
}
if (errno != EINTR) {
throw SysError(format("acquiring/releasing lock"));
}
}
}
@ -143,7 +147,9 @@ PathLocks::~PathLocks() {
void PathLocks::unlock() {
for (auto& i : fds) {
if (deletePaths) deleteLockFile(i.second, i.first);
if (deletePaths) {
deleteLockFile(i.second, i.first);
}
if (close(i.first) == -1) {
LOG(WARNING) << "cannot close lock file on '" << i.second << "'";