diff options
| -rw-r--r-- | src/build_log.cc | 4 | ||||
| -rw-r--r-- | src/build_log_test.cc | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/build_log.cc b/src/build_log.cc index df09ece..501b15b 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -138,14 +138,14 @@ bool BuildLog::Load(const string& path, string* err) { start_time = atoi(start); start = end + 1; - char* end = strchr(start, field_separator); + end = strchr(start, field_separator); if (!end) continue; *end = 0; end_time = atoi(start); start = end + 1; - char* end = strchr(start, field_separator); + end = strchr(start, field_separator); if (!end) continue; *end = 0; diff --git a/src/build_log_test.cc b/src/build_log_test.cc index f8c8ec3..005b929 100644 --- a/src/build_log_test.cc +++ b/src/build_log_test.cc @@ -67,8 +67,9 @@ TEST_F(BuildLogTest, WriteRead) { TEST_F(BuildLogTest, DoubleEntry) { FILE* f = fopen(kTestFilename, "wb"); - fprintf(f, "0 out command abc\n"); - fprintf(f, "0 out command def\n"); + fprintf(f, "# ninja log v3\n"); + fprintf(f, "0 1 2 out command abc\n"); + fprintf(f, "3 4 5 out command def\n"); fclose(f); string err; @@ -116,10 +117,10 @@ TEST_F(BuildLogTest, Truncate) { } } -TEST_F(BuildLogTest, UpgradeV2) { +TEST_F(BuildLogTest, UpgradeV3) { FILE* f = fopen(kTestFilename, "wb"); - fprintf(f, "# ninja log v2\n"); - fprintf(f, "123 456 out command\n"); + fprintf(f, "# ninja log v3\n"); + fprintf(f, "123 456 0 out command\n"); fclose(f); string err; |