Changeset 3068

Timestamp:

22/01/2012 16:36:27 (4 months ago)

Author:

chris

Message:

Rename the BackupStoreDirectory::AddEntry?'s AttributesModTime? parameter to AttributesHash? to avoid misleading the reader.

Location:

box/trunk/lib/backupstore

Files:

• BackupStoreDirectory.cpp (modified) (3 diffs)
• BackupStoreDirectory.h (modified) (1 diff)

box/trunk/lib/backupstore/BackupStoreDirectory.cpp

@@ -116 +116 @@
 // 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
 //
@@ -132 +133 @@
         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)));
         }
         
@@ -308 +314 @@
 //
 // --------------------------------------------------------------------------
-BackupStoreDirectory::Entry *BackupStoreDirectory::AddEntry(const BackupStoreFilename &rName, box_time_t ModificationTime, int64_t ObjectID, int64_t SizeInBlocks, int16_t Flags, box_time_t AttributesModTime)
-{
-        Entry *pnew = new Entry(rName, ModificationTime, ObjectID, SizeInBlocks, Flags, 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, AttributesHash);
         try
         {

box/trunk/lib/backupstore/BackupStoreDirectory.h

@@ -150 +150 @@
                         
         Entry *AddEntry(const Entry &rEntryToCopy);
-        Entry *AddEntry(const BackupStoreFilename &rName, box_time_t ModificationTime, int64_t ObjectID, int64_t SizeInBlocks, int16_t Flags, box_time_t AttributesModTime);
+        Entry *AddEntry(const BackupStoreFilename &rName,
+                box_time_t ModificationTime, int64_t ObjectID,
+                int64_t SizeInBlocks, int16_t Flags,
+                uint64_t AttributesHash);
         void DeleteEntry(int64_t ObjectID);
         Entry *FindEntryByID(int64_t ObjectID) const;