maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix): Add braces around single-line conditionals

Browse source 
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
This commit is contained in:
Vincent Ambo 2020-05-19 18:55:58 +01:00
parent c6a31838cd
commit 867055133d
97 changed files with 2223 additions and 753 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/nix/src/libstore/references.cc vendored
View file

@ -35,7 +35,9 @@ static void search(const unsigned char* s, size_t len, StringSet& hashes,
match = false;
break;
}
if (!match) continue;
if (!match) {
continue;
}
string ref((const char*)s + i, refLength);
if (hashes.find(ref) != hashes.end()) {
DLOG(INFO) << "found reference to '" << ref << "' at offset " << i;
@ -88,7 +90,9 @@ PathSet scanForReferences(const string& path, const PathSet& refs,
for (auto& i : refs) {
string baseName = baseNameOf(i);
string::size_type pos = baseName.find('-');
if (pos == string::npos) throw Error(format("bad reference '%1%'") % i);
if (pos == string::npos) {
throw Error(format("bad reference '%1%'") % i);
}
string s = string(baseName, 0, pos);
assert(s.size() == refLength);
assert(backMap.find(s) == backMap.end());
@ -104,7 +108,9 @@ PathSet scanForReferences(const string& path, const PathSet& refs,
PathSet found;
for (auto& i : sink.seen) {
std::map<string, Path>::iterator j;
if ((j = backMap.find(i)) == backMap.end()) abort();
if ((j = backMap.find(i)) == backMap.end()) {
abort();
}
found.insert(j->second);
}