diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
commit | 426a506afd1ffb3bd67e61b4693ee9bb968097a1 (patch) | |
tree | a6a726552411a781e692de657e3a630fa8d65d65 /lib/backupstore/BackupStoreContext.cpp | |
parent | 75ad60bcc4d33589bb5afb307a87fd19b220a9e8 (diff) |
Simplify code with macros, update comments and fix whitespace.
Hopefully all of these changes are inconsequential.
Merged back changes from the test refactor branch to reduce diffs.
Diffstat (limited to 'lib/backupstore/BackupStoreContext.cpp')
-rw-r--r-- | lib/backupstore/BackupStoreContext.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp index 5b94cd41..d9912510 100644 --- a/lib/backupstore/BackupStoreContext.cpp +++ b/lib/backupstore/BackupStoreContext.cpp @@ -350,12 +350,9 @@ BackupStoreDirectory &BackupStoreContext::GetDirectoryInternal(int64_t ObjectID) std::auto_ptr<RaidFileRead> objectFile(RaidFileRead::Open(mStoreDiscSet, filename, &revID)); ASSERT(revID != 0); - // New directory object - std::auto_ptr<BackupStoreDirectory> dir(new BackupStoreDirectory); - // Read it from the stream, then set it's revision ID BufferedStream buf(*objectFile); - dir->ReadFromStream(buf, IOStream::TimeOutInfinite); + std::auto_ptr<BackupStoreDirectory> dir(new BackupStoreDirectory(buf)); dir->SetRevisionID(revID); // Make sure the size of the directory is available for writing the dir back |