diff options
author | Scott Graham <scottmg@chromium.org> | 2014-11-09 07:01:23 (GMT) |
---|---|---|
committer | Scott Graham <scottmg@chromium.org> | 2014-11-09 07:01:23 (GMT) |
commit | 4ee1cb54d77d902a0223ebde12dff3b3efec8a8d (patch) | |
tree | bd771c7674ee2fe5ba4c334948c9149ba4ea98b9 /src/util.cc | |
parent | 559389de082406f44ae752a2494e53000d31a7df (diff) | |
download | Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.zip Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.gz Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.bz2 |
fix order of args to CanonicalizePath
Diffstat (limited to 'src/util.cc')
-rw-r--r-- | src/util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.cc b/src/util.cc index cccf59c..ed878d1 100644 --- a/src/util.cc +++ b/src/util.cc @@ -85,13 +85,13 @@ void Error(const char* msg, ...) { fprintf(stderr, "\n"); } -bool CanonicalizePath(string* path, string* err, unsigned int* slash_bits) { +bool CanonicalizePath(string* path, unsigned int* slash_bits, string* err) { METRIC_RECORD("canonicalize str"); size_t len = path->size(); char* str = 0; if (len > 0) str = &(*path)[0]; - if (!CanonicalizePath(str, &len, err, slash_bits)) + if (!CanonicalizePath(str, &len, slash_bits, err)) return false; path->resize(len); return true; @@ -108,8 +108,8 @@ unsigned int ShiftOverBit(int offset, unsigned int bits) { return (above >> 1) | below; } -bool CanonicalizePath(char* path, size_t* len, string* err, - unsigned int* slash_bits) { +bool CanonicalizePath(char* path, size_t* len, unsigned int* slash_bits, + string* err) { // WARNING: this function is performance-critical; please benchmark // any changes you make to it. METRIC_RECORD("canonicalize path"); |