diff options
author | Chris Wilson <chris+github@qwirx.com> | 2012-01-22 16:36:27 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2012-01-22 16:36:27 +0000 |
commit | 627f2f8ccd0208a735a46cf4d9960fd3e0eb2f7c (patch) | |
tree | e1a4e1eb68a5a9b49e03dd145aebcc63755b4625 /lib/backupstore/BackupStoreDirectory.cpp | |
parent | 24f341ac16373577c9737042306f930f484e1802 (diff) |
Rename the BackupStoreDirectory::AddEntry's AttributesModTime parameter to AttributesHash to avoid misleading the reader.
Diffstat (limited to 'lib/backupstore/BackupStoreDirectory.cpp')
-rw-r--r-- | lib/backupstore/BackupStoreDirectory.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/backupstore/BackupStoreDirectory.cpp b/lib/backupstore/BackupStoreDirectory.cpp index 0d06da34..81126ede 100644 --- a/lib/backupstore/BackupStoreDirectory.cpp +++ b/lib/backupstore/BackupStoreDirectory.cpp @@ -115,7 +115,8 @@ BackupStoreDirectory::~BackupStoreDirectory() // // Function // Name: BackupStoreDirectory::ReadFromStream(IOStream &, int) -// Purpose: Reads the directory contents from a stream. Exceptions will yeild incomplete reads. +// Purpose: Reads the directory contents from a stream. +// Exceptions will result in incomplete reads. // Created: 2003/08/26 // // -------------------------------------------------------------------------- @@ -131,7 +132,12 @@ void BackupStoreDirectory::ReadFromStream(IOStream &rStream, int Timeout) // Check magic value... if(OBJECTMAGIC_DIR_MAGIC_VALUE != ntohl(hdr.mMagicValue)) { - THROW_EXCEPTION(BackupStoreException, BadDirectoryFormat) + THROW_EXCEPTION_MESSAGE(BackupStoreException, BadDirectoryFormat, + "Wrong magic number in directory object " << + BOX_FORMAT_OBJECTID(mObjectID) << ": expected " << + BOX_FORMAT_HEX32(OBJECTMAGIC_DIR_MAGIC_VALUE) << + " but found " << + BOX_FORMAT_HEX32(ntohl(hdr.mMagicValue))); } // Get data @@ -307,9 +313,13 @@ BackupStoreDirectory::Entry *BackupStoreDirectory::AddEntry(const Entry &rEntryT // Created: 2003/08/27 // // -------------------------------------------------------------------------- -BackupStoreDirectory::Entry *BackupStoreDirectory::AddEntry(const BackupStoreFilename &rName, box_time_t ModificationTime, int64_t ObjectID, int64_t SizeInBlocks, int16_t Flags, box_time_t AttributesModTime) +BackupStoreDirectory::Entry * +BackupStoreDirectory::AddEntry(const BackupStoreFilename &rName, + box_time_t ModificationTime, int64_t ObjectID, int64_t SizeInBlocks, + int16_t Flags, uint64_t AttributesHash) { - Entry *pnew = new Entry(rName, ModificationTime, ObjectID, SizeInBlocks, Flags, AttributesModTime); + Entry *pnew = new Entry(rName, ModificationTime, ObjectID, + SizeInBlocks, Flags, AttributesHash); try { mEntries.push_back(pnew); |