diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-19T16·38+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-19T16·38+0100 |
commit | b490742a511dd03afc43f5143d6d61edaeeb8091 (patch) | |
tree | 727370e8e7607a3078c2ce1cd6d717105c7d9c44 /third_party/nix/src/libutil/util.cc | |
parent | c758de9d22506eb279c5abe61f621e5c8f61af95 (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/libutil/util.cc')
-rw-r--r-- | third_party/nix/src/libutil/util.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/nix/src/libutil/util.cc b/third_party/nix/src/libutil/util.cc index 941680b70a70..1740d1f256d0 100644 --- a/third_party/nix/src/libutil/util.cc +++ b/third_party/nix/src/libutil/util.cc @@ -194,7 +194,9 @@ bool pathExists(const Path& path) { int res; struct stat st; res = lstat(path.c_str(), &st); - if (!res) return true; + if (!res) { + return true; + } if (errno != ENOENT && errno != ENOTDIR) throw SysError(format("getting status of %1%") % path); return false; @@ -579,9 +581,9 @@ AutoDelete::AutoDelete(const string& p, bool recursive) : path(p) { AutoDelete::~AutoDelete() { try { if (del) { - if (recursive) + if (recursive) { deletePath(path); - else { + } else { if (remove(path.c_str()) == -1) throw SysError(format("cannot unlink '%1%'") % path); } @@ -1200,7 +1202,9 @@ string base64Decode(const string& s) { if (!init) { // FIXME: not thread-safe. memset(decode, -1, sizeof(decode)); - for (int i = 0; i < 64; i++) decode[(int)base64Chars[i]] = i; + for (int i = 0; i < 64; i++) { + decode[(int)base64Chars[i]] = i; + } init = true; } |