mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

use std::binary_search to search switch blacklist

Browse source
This commit is contained in:
Charles Kerr 2018-01-31 17:36:06 -07:00
parent 8405fe763e
commit 09a2c80443
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/app/command_line_args.cc
View file

@ -1388,11 +1388,8 @@ bool IsBlacklistedArg(const base::CommandLine::CharType* arg) {
a += prefix_length; a += prefix_length;
std::string switch_name = std::string switch_name =
base::ToLowerASCII(base::StringPiece(a, strcspn(a, "="))); base::ToLowerASCII(base::StringPiece(a, strcspn(a, "=")));
auto* iter = std::lower_bound(std::begin(kBlacklist), std::end(kBlacklist), return std::lower_bound(std::begin(kBlacklist), std::end(kBlacklist),
switch_name); switch_name);
if (iter != std::end(kBlacklist) && switch_name == *iter) {
return true;
}
} }
return false; return false;
@ -1408,9 +1405,8 @@ bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
return base::StringPiece(a) < base::StringPiece(b); return base::StringPiece(a) < base::StringPiece(b);
})) }))
<< "The kBlacklist must be in sorted order"; << "The kBlacklist must be in sorted order";
DCHECK_NE(std::find(std::begin(kBlacklist), std::end(kBlacklist), DCHECK_NE(std::binary_search(std::begin(kBlacklist), std::end(kBlacklist),
base::StringPiece("inspect")), base::StringPiece("inspect"));
std::end(kBlacklist))
<< "Do not forget to add Node command line flags to kBlacklist"; << "Do not forget to add Node command line flags to kBlacklist";
const base::CommandLine::StringType dashdash(2, '-'); const base::CommandLine::StringType dashdash(2, '-');