Changeset 2618

Timestamp:

18/02/2010 14:59:47 (2 years ago)

Author:

chris

Message:

Log the mismatched timestamps of files during compare in a human-readable
format as well as the raw numbers.

Use existing helper functions to convert box_time_t to seconds, rather than
just arbitrarily dividing by 1000000.

File:

• box/trunk/lib/backupclient/BackupClientFileAttributes.cpp (modified) (1 diff)

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -260 +260 @@
         COMPARE(UserDefinedFlags, "User-defined flags");
         COMPARE(Mode, "Modes");
-        
+
         if(!IgnoreModTime)
         {
-                uint64_t t1 = box_ntoh64(a1->ModificationTime) / 1000000;
-                uint64_t t2 = box_ntoh64(a2->ModificationTime) / 1000000;
-                if(t1 != t2)
+                uint64_t t1 = box_ntoh64(a1->ModificationTime);
+                uint64_t t2 = box_ntoh64(a2->ModificationTime);
+                time_t s1 = BoxTimeToSeconds(t1);
+                time_t s2 = BoxTimeToSeconds(t2);
+                if(s1 != s2)
                 {
                         BOX_TRACE("Attribute Compare: File modification "
-                                "times differ: local " << t1 << ", "
-                                "remote " << t2);
+                                "times differ: local " <<
+                                FormatTime(t1, true) << " (" << s1 << "), "
+                                "remote " <<
+                                FormatTime(t2, true) << " (" << s2 << ")");
                         return false;
                 }
         }
-
+        
         if(!IgnoreAttrModTime)
         {
-                uint64_t t1 = box_ntoh64(a1->AttrModificationTime) / 1000000;
-                uint64_t t2 = box_ntoh64(a2->AttrModificationTime) / 1000000;
-                if(t1 != t2)
+                uint64_t t1 = box_ntoh64(a1->AttrModificationTime);
+                uint64_t t2 = box_ntoh64(a2->AttrModificationTime);
+                time_t s1 = BoxTimeToSeconds(t1);
+                time_t s2 = BoxTimeToSeconds(t2);
+                if(s1 != s2)
                 {
                         BOX_TRACE("Attribute Compare: Attribute modification "
-                                "times differ: local " << t1 << ", "
-                                "remote " << t2);
+                                "times differ: local " <<
+                                FormatTime(t1, true) << " (" << s1 << "), "
+                                "remote " <<
+                                FormatTime(t2, true) << " (" << s2 << ")");
                         return false;
                 }