diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-11-09 06:49:21 (GMT) |
| commit | 559389de082406f44ae752a2494e53000d31a7df (patch) | |
| tree | 3b82939a355ae91662c605b35e739e7f032db6e6 /src/ninja.cc | |
| parent | 8177085f4d3adf78b9709069a9c3ce5fe442867a (diff) | |
| download | Ninja-559389de082406f44ae752a2494e53000d31a7df.zip Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.gz Ninja-559389de082406f44ae752a2494e53000d31a7df.tar.bz2 | |
remove CanonicalizePath overloads, test for toplevel behaviour
Diffstat (limited to 'src/ninja.cc')
| -rw-r--r-- | src/ninja.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 4368fab..5831e26 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -228,7 +228,8 @@ struct RealFileReader : public ManifestParser::FileReader { /// Returns true if the manifest was rebuilt. bool NinjaMain::RebuildManifest(const char* input_file, string* err) { string path = input_file; - if (!CanonicalizePath(&path, err)) + unsigned int slash_bits; // Unused because this path is only used for lookup. + if (!CanonicalizePath(&path, err, &slash_bits)) return false; Node* node = state_.LookupNode(path); if (!node) @@ -250,7 +251,8 @@ bool NinjaMain::RebuildManifest(const char* input_file, string* err) { Node* NinjaMain::CollectTarget(const char* cpath, string* err) { string path = cpath; - if (!CanonicalizePath(&path, err)) + unsigned int slash_bits; // Unused because this path is only used for lookup. + if (!CanonicalizePath(&path, err, &slash_bits)) return NULL; // Special syntax: "foo.cc^" means "the first output of foo.cc". |