about summary refs log tree commit diff
path: root/third_party/nix/src/libstore/pathlocks.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
committerVincent Ambo <tazjin@google.com>2020-05-19T17·55+0100
commit867055133d3f487e52dd44149f76347c2c28bf10 (patch)
treec367803ad94f024b0052727a2c7a037af169169a /third_party/nix/src/libstore/pathlocks.cc
parentc6a31838cd7e88ebcb01422b329a499d04ab4b6b (diff)
style(3p/nix): Add braces around single-line conditionals r/771
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
Diffstat (limited to 'third_party/nix/src/libstore/pathlocks.cc')
-rw-r--r--third_party/nix/src/libstore/pathlocks.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/pathlocks.cc b/third_party/nix/src/libstore/pathlocks.cc
index d71717e73ed2..ffec3d7d7ea6 100644
--- a/third_party/nix/src/libstore/pathlocks.cc
+++ b/third_party/nix/src/libstore/pathlocks.cc
@@ -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 << "'";