Move trim to anonymous namespace
This commit is contained in:
parent
e0f3b2718a
commit
9379bab04e
|
@ -26,6 +26,28 @@
|
|||
#include "flow/Platform.h"
|
||||
#include "flow/actorcompiler.h" // has to be last include
|
||||
|
||||
namespace {
|
||||
|
||||
std::string trim(std::string const& connectionString) {
|
||||
// Strip out whitespace
|
||||
// Strip out characters between a # and a newline
|
||||
std::string trimmed;
|
||||
auto end = connectionString.end();
|
||||
for (auto c = connectionString.begin(); c != end; ++c) {
|
||||
if (*c == '#') {
|
||||
++c;
|
||||
while (c != end && *c != '\n' && *c != '\r')
|
||||
++c;
|
||||
if (c == end)
|
||||
break;
|
||||
} else if (*c != ' ' && *c != '\n' && *c != '\r' && *c != '\t')
|
||||
trimmed += *c;
|
||||
}
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
std::pair<std::string, bool> ClusterConnectionFile::lookupClusterFileName(std::string const& filename) {
|
||||
if (filename.length())
|
||||
return std::make_pair(filename, false);
|
||||
|
@ -154,24 +176,6 @@ std::string ClusterConnectionString::getErrorString(std::string const& source, E
|
|||
}
|
||||
}
|
||||
|
||||
std::string trim(std::string const& connectionString) {
|
||||
// Strip out whitespace
|
||||
// Strip out characters between a # and a newline
|
||||
std::string trimmed;
|
||||
auto end = connectionString.end();
|
||||
for (auto c = connectionString.begin(); c != end; ++c) {
|
||||
if (*c == '#') {
|
||||
++c;
|
||||
while (c != end && *c != '\n' && *c != '\r')
|
||||
++c;
|
||||
if (c == end)
|
||||
break;
|
||||
} else if (*c != ' ' && *c != '\n' && *c != '\r' && *c != '\t')
|
||||
trimmed += *c;
|
||||
}
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
ClusterConnectionString::ClusterConnectionString(std::string const& connectionString) {
|
||||
auto trimmed = trim(connectionString);
|
||||
|
||||
|
|
Loading…
Reference in New Issue