Fixed a typo and naming convention.
llvm-svn: 184221
diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp
index cd5a2b9..523a9e2 100644
--- a/clang-tools-extra/modularize/Modularize.cpp
+++ b/clang-tools-extra/modularize/Modularize.cpp
@@ -113,7 +113,7 @@
" the files are considered to be relative to the header list file."));
// Read the header list file and collect the header file names.
-error_code GetHeaderFileNames(SmallVectorImpl<std::string> &headerFileNames,
+error_code getHeaderFileNames(SmallVectorImpl<std::string> &headerFileNames,
StringRef listFileName, StringRef headerPrefix) {
// By default, use the path component of the list file name.
@@ -445,7 +445,7 @@
// Get header file names.
SmallVector<std::string, 32> Headers;
- if (error_code ec = GetHeaderFileNames(Headers, ListFileName, HeaderPrefix)) {
+ if (error_code ec = getHeaderFileNames(Headers, ListFileName, HeaderPrefix)) {
errs() << argv[0] << ": error: Unable to get header list '" << ListFileName
<< "': " << ec.message() << '\n';
return 1;
@@ -524,7 +524,7 @@
HadErrors = 1;
errs() << "error: header '" << H->first->getName()
- << "' has different contents dependening on how it was included\n";
+ << "' has different contents depending on how it was included\n";
for (unsigned I = 0, N = H->second.size(); I != N; ++I) {
errs() << "note: '" << H->second[I].Name << "' in " << H->second[I]
.Loc.File->getName() << " at " << H->second[I].Loc.Line << ":"
diff --git a/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize b/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize
index fe907b1..28f6607 100644
--- a/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize
+++ b/clang-tools-extra/test/modularize/ProblemsInconsistent.modularize
@@ -6,7 +6,7 @@
# CHECK: error: macro 'SYMBOL' defined at multiple locations:
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:3:9
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:6:9
-# CHECK-NEXT: error: header '{{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h' has different contents dependening on how it was included
+# CHECK-NEXT: error: header '{{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h' has different contents depending on how it was included
# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 3:9 not always provided
# CHECK-NEXT: note: 'SYMBOL' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 6:9 not always provided
# CHECK-NEXT: note: 'TypeInt' in {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h at 10:13 not always provided