diff options
| author |  Thiago Farina <tfarina@chromium.org> | 2016-03-21 08:39:48 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-03-21 09:37:16 +0000 |
| commit | 9bc5c34ca8242836705ab904261cadb4013e006d (patch) | |
| tree | 7c2d22d3d15809c7d4024dbcbf1d727ab8a3dc8e | |
| parent | 7857c798300c4eea9cf2172531f150f261ce158d (diff) | |
cpp: fix the path to BlazeServerStartupOptions file in a comment
While at it, fix a "the the" typo in another comment at
option_processor.cc.
--
Change-Id: I0ce6b320f3d3a50d53c8671d1b9dc80d5a2ace06
Reviewed-on: https://bazel-review.googlesource.com/#/c/3100/1
MOS_MIGRATED_REVID=117693263
| -rw-r--r-- | src/main/cpp/blaze_startup_options.h | 4 | ||||
| -rw-r--r-- | src/main/cpp/option_processor.cc | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/cpp/blaze_startup_options.h b/src/main/cpp/blaze_startup_options.h index d82bfad00c..3e984879b8 100644 --- a/src/main/cpp/blaze_startup_options.h +++ b/src/main/cpp/blaze_startup_options.h @@ -28,8 +28,8 @@ using std::string; struct StartupOptions; // This class holds the parsed startup options for Blaze. -// These options and their defaults must be kept in sync with those -// in java/com/google/devtools/build/lib/blaze/BlazeServerStartupOptions. +// These options and their defaults must be kept in sync with those in +// src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java. // The latter are purely decorative (they affect the help message, // which displays the defaults). The actual defaults are defined // in the constructor. diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc index a71b56599d..0696b5a8a5 100644 --- a/src/main/cpp/option_processor.cc +++ b/src/main/cpp/option_processor.cc @@ -193,7 +193,6 @@ string OptionProcessor::FindAlongsideBinaryBlazerc(const string& cwd, return ""; } - // Return the path of the bazelrc file that sits in /etc. // This allows for installing Bazel on system-wide directory. string OptionProcessor::FindSystemWideBlazerc() { @@ -204,8 +203,7 @@ string OptionProcessor::FindSystemWideBlazerc() { return ""; } - -// Return the path the the user rc file. If cmdLineRcFile != NULL, +// Return the path to the user's rc file. If cmdLineRcFile != NULL, // use it, dying if it is not readable. Otherwise, return the first // readable file called rc_basename from [workspace, $HOME] // |