TrimWhiteSpace -> TrimWhitespace

Fix my dumb initial capitalization choice.
pull/1124/head
Jason Rhinelander 4 years ago
parent 74d4afad51
commit 46242ba69b

@ -279,12 +279,12 @@ namespace llarp
idx = val.find_first_of(delimiter);
if(idx != string_view::npos)
{
parsed_opts.insert(TrimWhiteSpace(val.substr(0, idx)));
parsed_opts.insert(TrimWhitespace(val.substr(0, idx)));
val.remove_prefix(idx + 1);
}
else
{
parsed_opts.insert(TrimWhiteSpace(val));
parsed_opts.insert(TrimWhitespace(val));
}
} while(idx != string_view::npos);
std::unordered_set< std::string > opts;

@ -191,7 +191,7 @@ namespace llarp
{
routerStr = v;
}
routerStr = TrimWhiteSpace(routerStr);
routerStr = TrimWhitespace(routerStr);
if(!(exitRouter.FromString(routerStr)
|| HexDecode(routerStr.c_str(), exitRouter.begin(),
exitRouter.size())))

@ -64,7 +64,7 @@ namespace llarp
constexpr static char whitespace[] = " \t\n\r\f\v";
string_view
TrimWhiteSpace(string_view str)
TrimWhitespace(string_view str)
{
size_t begin = str.find_first_not_of(whitespace);
if(begin == string_view::npos)

@ -26,7 +26,7 @@ namespace llarp
[[gnu::warn_unused_result]]
#endif
string_view
TrimWhiteSpace(string_view str);
TrimWhitespace(string_view str);
} // namespace llarp

@ -3,7 +3,7 @@
using namespace std::literals;
TEST_CASE("TrimWhiteSpace -- positive tests", "[str][trim]")
TEST_CASE("TrimWhitespace -- positive tests", "[str][trim]")
{
// Test that things that should be trimmed actually get trimmed
auto fee = " J a c k"s;
@ -11,7 +11,7 @@ TEST_CASE("TrimWhiteSpace -- positive tests", "[str][trim]")
auto fo = "\fthe "s;
auto fum = " \t\r\n\v\f Beanstalk\n\n\n\t\r\f\v \n\n\r\f\f\f\f\v"s;
for (auto* s: {&fee, &fi, &fo, &fum})
*s = llarp::TrimWhiteSpace(*s);
*s = llarp::TrimWhitespace(*s);
REQUIRE( fee == "J a c k" );
REQUIRE( fi == "a\nd" );
@ -24,7 +24,7 @@ TEST_CASE("TrimWhitespace -- negative tests", "[str][trim]")
// Test that things that shouldn't be trimmed don't get trimmed
auto c = GENERATE(range(std::numeric_limits<char>::min(), std::numeric_limits<char>::max()));
std::string plant = c + "bean"s + c;
plant = llarp::TrimWhiteSpace(plant);
plant = llarp::TrimWhitespace(plant);
if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f' || c == '\v')
REQUIRE( plant == "bean" );
else

Loading…
Cancel
Save