about summary refs log tree commit diff
path: root/third_party/nix/src/libstore/store-api.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-19T16·38+0100
committerVincent Ambo <tazjin@google.com>2020-05-19T16·38+0100
commitb490742a511dd03afc43f5143d6d61edaeeb8091 (patch)
tree727370e8e7607a3078c2ce1cd6d717105c7d9c44 /third_party/nix/src/libstore/store-api.cc
parentc758de9d22506eb279c5abe61f621e5c8f61af95 (diff)
style(3p/nix): Enforce braces around loops and conditionals r/767
This change was generated with:

  fd -e cc -e hh | xargs -I{} clang-tidy {} -p ~/projects/nix-build/ \
    --checks='-*,readability-braces-around-statements' --fix \
    -fix-errors

Some manual fixes were applied because some convoluted unbraced
statements couldn't be untangled by clang-tidy.

This commit still includes invalid files, but I decided to clean them
up in a subsequent commit so that it becomes more obvious where
clang-tidy failed. Maybe this will allow for a bug-report to
clang-tidy.
Diffstat (limited to 'third_party/nix/src/libstore/store-api.cc')
-rw-r--r--third_party/nix/src/libstore/store-api.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/store-api.cc b/third_party/nix/src/libstore/store-api.cc
index 2ea478c1bddf..736970e8db99 100644
--- a/third_party/nix/src/libstore/store-api.cc
+++ b/third_party/nix/src/libstore/store-api.cc
@@ -42,7 +42,9 @@ Path Store::toStorePath(const Path& path) const {
 Path Store::followLinksToStore(const Path& _path) const {
   Path path = absPath(_path);
   while (!isInStore(path)) {
-    if (!isLink(path)) break;
+    if (!isLink(path)) {
+      break;
+    }
     string target = readLink(path);
     path = absPath(target, dirOf(path));
   }
@@ -828,10 +830,11 @@ StoreType getStoreType(const std::string& uri, const std::string& stateDir) {
   } else if (uri == "" || uri == "auto") {
     if (access(stateDir.c_str(), R_OK | W_OK) == 0)
       return tLocal;
-    else if (pathExists(settings.nixDaemonSocketFile))
+    else if (pathExists(settings.nixDaemonSocketFile)) {
       return tDaemon;
-    else
+    } else {
       return tLocal;
+    }
   } else {
     return tOther;
   }