aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Thiago Farina <tfarina@chromium.org>2016-04-27 16:16:27 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2016-04-27 17:12:08 +0000
commit5735c25c0066f9563935334703a823c22f932505 (patch)
tree244a216fcda0fd6914e874ad7dfd9935bc35bac0
parent8e093e3a3fcd6f199a3b6cf579526485e681a7f4 (diff)
cpp: fix "commom" typo in AddLoggingArgs() documentation
The correct spelling of it, is, of course, "common". While at this, this also fix a mistaken usage of "from" instead of "form" in ConvertPath() documentation. -- Change-Id: If93984b57da0c98b6dfe4ca70fd4158bd9e1a861 Reviewed-on: https://bazel-review.googlesource.com/#/c/3500 MOS_MIGRATED_REVID=120921796
-rw-r--r--src/main/cpp/blaze.cc5
-rw-r--r--src/main/cpp/blaze_util_platform.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index bc023428a3..1cdef6b9ea 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -468,7 +468,7 @@ static vector<string> GetArgumentArray() {
return result;
}
-// Add commom command options for logging to the given argument array.
+// Add common command options for logging to the given argument array.
static void AddLoggingArgs(vector<string>* args) {
args->push_back("--startup_time=" + ToString(globals->startup_time));
if (globals->command_wait_time != 0) {
@@ -508,8 +508,7 @@ static void GoToWorkspace() {
}
// Check the java version if a java version specification is bundled. On
-// success,
-// return the executable path of the java command.
+// success, returns the executable path of the java command.
static string VerifyJavaVersionAndGetJvm() {
string exe = globals->options.GetJvm();
diff --git a/src/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h
index 326899e07a..3d3463c9fb 100644
--- a/src/main/cpp/blaze_util_platform.h
+++ b/src/main/cpp/blaze_util_platform.h
@@ -74,7 +74,7 @@ string RunProgram(const string& exe, const std::vector<string>& args_vector);
// Convert a path from Bazel internal form to underlying OS form.
// On Unixes this is an identity operation.
-// On Windows, Bazel internal from is cygwin path, and underlying OS form
+// On Windows, Bazel internal form is cygwin path, and underlying OS form
// is Windows path.
std::string ConvertPath(const std::string& path);