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.
This commit is contained in:
parent
c758de9d22
commit
b490742a51
44 changed files with 661 additions and 298 deletions
12
third_party/nix/src/libutil/util.cc
vendored
12
third_party/nix/src/libutil/util.cc
vendored
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue