Rename expand_wildcards to correct style

pull/5044/head
Laszlo Csomor 6 years ago
parent bc813c372e
commit ce180aa309
  1. 2
      src/google/protobuf/compiler/command_line_interface.cc
  2. 2
      src/google/protobuf/io/io_win32.cc
  3. 2
      src/google/protobuf/io/io_win32.h
  4. 16
      src/google/protobuf/io/io_win32_unittest.cc

@ -1432,7 +1432,7 @@ CommandLineInterface::InterpretArgument(const std::string& name,
#if defined(_WIN32)
// On Windows, the shell (typically cmd.exe) does not expand wildcards in
// file names (e.g. foo\*.proto), so we do it ourselves.
switch (google::protobuf::io::win32::expand_wildcards(
switch (google::protobuf::io::win32::ExpandWildcards(
value,
[this](const string& path) {
this->input_files_.push_back(path);

@ -362,7 +362,7 @@ wstring testonly_utf8_to_winpath(const char* path) {
return as_windows_path(path, &wpath) ? wpath : wstring();
}
int expand_wildcards(
int ExpandWildcards(
const string& path, std::function<void(const string&)> consume) {
if (path.find_first_of("*?") == string::npos) {
// There are no wildcards in the path, we don't need to expand it.

@ -93,7 +93,7 @@ struct ExpandWildcardsResult {
// `consume`. The resulting paths may not be absolute nor normalized.
//
// The function returns a value from `ExpandWildcardsResult`.
LIBPROTOBUF_EXPORT int expand_wildcards(
LIBPROTOBUF_EXPORT int ExpandWildcards(
const std::string& path, std::function<void(const std::string&)> consume);
namespace strings {

@ -430,7 +430,7 @@ TEST_F(IoWin32Test, ExpandWildcardsInRelativePathTest) {
vector<string> found_bad;
// Assert matching a relative path pattern. Results should also be relative.
int result =
expand_wildcards(
ExpandWildcards(
string(kUtf8Text) + "\\foo*.proto",
[&found_a, &found_b, &found_bad](const string& p) {
if (p == string(kUtf8Text) + "\\foo_a.proto") {
@ -452,7 +452,7 @@ TEST_F(IoWin32Test, ExpandWildcardsInRelativePathTest) {
found_a = 0;
found_bad.clear();
result =
expand_wildcards(
ExpandWildcards(
string(kUtf8Text) + "\\foo_a.proto",
[&found_a, &found_bad](const string& p) {
if (p == string(kUtf8Text) + "\\foo_a.proto") {
@ -482,7 +482,7 @@ TEST_F(IoWin32Test, ExpandWildcardsInAbsolutePathTest) {
// Assert matching an absolute path. The results should also use absolute
// path.
int result =
expand_wildcards(
ExpandWildcards(
string(test_tmpdir) + "\\" + kUtf8Text + "\\foo*.proto",
[this, &found_a, &found_b, &found_bad](const string& p) {
if (p == string(this->test_tmpdir)
@ -510,7 +510,7 @@ TEST_F(IoWin32Test, ExpandWildcardsInAbsolutePathTest) {
found_a = 0;
found_bad.clear();
result =
expand_wildcards(
ExpandWildcards(
string(test_tmpdir) + "\\" + kUtf8Text + "\\foo_a.proto",
[this, &found_a, &found_bad](const string& p) {
if (p == string(this->test_tmpdir)
@ -545,7 +545,7 @@ TEST_F(IoWin32Test, ExpandWildcardsIgnoresDirectoriesTest) {
// Assert that the pattern matches exactly the expected files, and using the
// absolute path as did the input pattern.
int result =
expand_wildcards(
ExpandWildcards(
string(kUtf8Text) + "\\foo*.proto",
[&found_a, &found_c, &found_bad](const string& p) {
if (p == string(kUtf8Text) + "\\foo_a.proto") {
@ -573,17 +573,17 @@ TEST_F(IoWin32Test, ExpandWildcardsFailsIfNoFileMatchesTest) {
EXPECT_TRUE(SetCurrentDirectoryW(wtest_tmpdir.c_str()));
// Control test: should match foo*.proto
int result = expand_wildcards(
int result = ExpandWildcards(
string(kUtf8Text) + "\\foo*.proto", [](const string&) {});
EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
// Control test: should match foo_a.proto
result = expand_wildcards(
result = ExpandWildcards(
string(kUtf8Text) + "\\foo_a.proto", [](const string&) {});
EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
// Actual test: should not match anything.
result = expand_wildcards(
result = ExpandWildcards(
string(kUtf8Text) + "\\bar*.proto", [](const string&) {});
ASSERT_EQ(result, ExpandWildcardsResult::kErrorNoMatchingFile);
}

Loading…
Cancel
Save