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

refactor(3p/nix): Apply clang-tidy's readability-* fixes

Browse source 
This applies the readability fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
This commit is contained in:
Vincent Ambo 2020-05-20 22:27:37 +01:00
parent d331d3a0b5
commit 689ef502f5
78 changed files with 863 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

18
third_party/nix/src/libutil/args.cc vendored
View file

@ -7,9 +7,9 @@ namespace nix {
Args::FlagMaker Args::mkFlag() { return FlagMaker(*this); }
Args::FlagMaker::~FlagMaker() {
assert(flag->longName != "");
assert(!flag->longName.empty());
args.longFlags[flag->longName] = flag;
if (flag->shortName) {
if (flag->shortName != 0) {
args.shortFlags[flag->shortName] = flag;
}
}
@ -26,12 +26,12 @@ void Args::parseCmdline(const Strings& _cmdline) {
/* Expand compound dash options (i.e., `-qlf' -> `-q -l -f',
`-j3` -> `-j 3`). */
if (!dashDash && arg.length() > 2 && arg[0] == '-' && arg[1] != '-' &&
isalpha(arg[1])) {
(isalpha(arg[1]) != 0)) {
*pos = (string) "-" + arg[1];
auto next = pos;
++next;
for (unsigned int j = 2; j < arg.length(); j++) {
if (isalpha(arg[j])) {
if (isalpha(arg[j]) != 0) {
cmdline.insert(next, (string) "-" + arg[j]);
} else {
cmdline.insert(next, string(arg, j));
@ -74,11 +74,11 @@ void Args::printHelp(const string& programName, std::ostream& out) {
std::cout << "\n";
auto s = description();
if (s != "") {
if (!s.empty()) {
std::cout << "\nSummary: " << s << ".\n";
}
if (longFlags.size()) {
if (!longFlags.empty() != 0u) {
std::cout << "\n";
std::cout << "Flags:\n";
printFlags(out);
@ -88,11 +88,11 @@ void Args::printHelp(const string& programName, std::ostream& out) {
void Args::printFlags(std::ostream& out) {
Table2 table;
for (auto& flag : longFlags) {
if (hiddenCategories.count(flag.second->category)) {
if (hiddenCategories.count(flag.second->category) != 0u) {
continue;
}
table.push_back(std::make_pair(
(flag.second->shortName
(flag.second->shortName != 0
? std::string("-") + flag.second->shortName + ", "
: " ") +
"--" + flag.first + renderLabels(flag.second->labels),
@ -188,7 +188,7 @@ Strings argvToStrings(int argc, char** argv) {
Strings args;
argc--;
argv++;
while (argc--) {
while ((argc--) != 0) {
args.push_back(*argv++);
}
return args;