From b490742a511dd03afc43f5143d6d61edaeeb8091 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 May 2020 17:38:04 +0100 Subject: style(3p/nix): Enforce braces around loops and conditionals 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. --- third_party/nix/src/libstore/store-api.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/store-api.cc') 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; } -- cgit 1.4.1