Changeset 2614 for box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

Timestamp:

16/02/2010 23:07:11 (2 years ago)

Author:

chris

Message:

Convert attributes to host byte order when reporting errors.

Convert timestamps to host byte order before dividing from usecs to secs,
store in uint64_t variables to avoid truncation, and display in host byte
order.

File:

• box/trunk/lib/backupclient/BackupClientFileAttributes.cpp (modified) (4 diffs)

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -251 +251 @@
         { \
                 BOX_TRACE("Attribute Compare: " << message << " differ: " \
-                        "local " << a1->attribute << ", " \
-                        "remote " << a2->attribute); \
+                        "local "  << ntoh(a1->attribute) << ", " \
+                        "remote " << ntoh(a2->attribute)); \
                 return false; \
         }
@@ -263 +263 @@
         if(!IgnoreModTime)
         {
-                int t1 = a1->ModificationTime / 1000000;
-                int t2 = a2->ModificationTime / 1000000;
+                uint64_t t1 = box_ntoh64(a1->ModificationTime) / 1000000;
+                uint64_t t2 = box_ntoh64(a2->ModificationTime) / 1000000;
                 if(t1 != t2)
                 {
@@ -276 +276 @@
         if(!IgnoreAttrModTime)
         {
-                int t1 = a1->AttrModificationTime / 1000000;
-                int t2 = a2->AttrModificationTime / 1000000;
+                uint64_t t1 = box_ntoh64(a1->AttrModificationTime) / 1000000;
+                uint64_t t2 = box_ntoh64(a2->AttrModificationTime) / 1000000;
                 if(t1 != t2)
                 {
@@ -300 +300 @@
                         BOX_TRACE("Attribute Compare: Symbolic link target "
                                 "or extended attributes differ: "
-                                "local " << PrintEscapedBinaryData(s1) << ", "
+                                "local "  << PrintEscapedBinaryData(s1) << ", "
                                 "remote " << PrintEscapedBinaryData(s2));
                         return false;