Permalink
Browse files

Merge pull request #338 from syntheticpp/empty-log-file

no recompacting needed when log file is empty
  • Loading branch information...
2 parents e152414 + f9abd79 commit 0d892830aa1b32b5a98fa7f81c588993a188af38 @evmar evmar committed Jun 18, 2012
Showing with 7 additions and 3 deletions.
  1. +7 −3 src/build_log.cc
View
@@ -223,7 +223,8 @@ bool BuildLog::Load(const string& path, string* err) {
int total_entry_count = 0;
LineReader reader(file);
- char* line_start, *line_end;
+ char* line_start = 0;
+ char* line_end = 0;
while (reader.ReadLine(&line_start, &line_end)) {
if (!log_version) {
log_version = 1; // Assume by default.
@@ -295,6 +296,11 @@ bool BuildLog::Load(const string& path, string* err) {
entry->command_hash = LogEntry::HashCommand(StringPiece(start,
end - start));
}
+ fclose(file);
+
+ if (!line_start) {
+ return true; // file was empty
+ }
// Decide whether it's time to rebuild the log:
// - if we're upgrading versions
@@ -308,8 +314,6 @@ bool BuildLog::Load(const string& path, string* err) {
needs_recompaction_ = true;
}
- fclose(file);
-
return true;
}

0 comments on commit 0d89283

Please sign in to comment.