commit f4465203b618fa57b6669c4d5627f32fb025b73e
author Elliott Hughes <enh@google.com> Mon Aug 24 14:27:03 2015 -0700
committer Elliott Hughes <enh@google.com> Mon Aug 24 14:27:03 2015 -0700
tree ba9b119481c44abae47d93c377fc3f8711ff346b
parent 186f1dee2afc15c8941a1f78e1aa97e2ec9970ee

There are no big endian hosts, grandpa.

Change-Id: I6f64f702f919fe4af10d82c5f395a051571815ed

adb/file_sync_client.cpp

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index c37c6dd..c83845c 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -79,7 +79,7 @@
     char buf[sizeof(SyncRequest) + path_length] __attribute__((aligned(8)));
     SyncRequest* req = reinterpret_cast<SyncRequest*>(buf);
     req->id = id;
-    req->path_length = htoll(path_length);
+    req->path_length = path_length;
     char* data = reinterpret_cast<char*>(req + 1);
     memcpy(data, path, path_length);
 
@@ -143,14 +143,14 @@
         if (msg.dent.id == ID_DONE) return true;
         if (msg.dent.id != ID_DENT) return false;
 
-        size_t len = ltohl(msg.dent.namelen);
+        size_t len = msg.dent.namelen;
         if (len > 256) return false; // TODO: resize buffer? continue?
 
         char buf[257];
         if (!ReadFdExactly(fd, buf, len)) return false;
         buf[len] = 0;
 
-        func(ltohl(msg.dent.mode), ltohl(msg.dent.size), ltohl(msg.dent.time), buf, cookie);
+        func(msg.dent.mode, msg.dent.size, msg.dent.time, buf, cookie);
     }
 }
 
@@ -165,9 +165,9 @@
         return false;
     }
 
-    if (timestamp) *timestamp = ltohl(msg.stat.time);
-    if (mode) *mode = ltohl(msg.stat.mode);
-    if (size) *size = ltohl(msg.stat.size);
+    if (timestamp) *timestamp = msg.stat.time;
+    if (mode) *mode = msg.stat.mode;
+    if (size) *size = msg.stat.size;
 
     return true;
 }
@@ -211,7 +211,7 @@
             break;
         }
 
-        sbuf->size = htoll(ret);
+        sbuf->size = ret;
         if (!WriteFdExactly(sc.fd, sbuf, sizeof(unsigned) * 2 + ret)) {
             err = -1;
             break;
@@ -238,7 +238,7 @@
     }
     sbuf->data[len] = '\0';
 
-    sbuf->size = htoll(len + 1);
+    sbuf->size = len + 1;
     sbuf->id = ID_DATA;
 
     if (!WriteFdExactly(sc.fd, sbuf, sizeof(unsigned) * 2 + len + 1)) {
@@ -269,14 +269,14 @@
 
     syncmsg msg;
     msg.data.id = ID_DONE;
-    msg.data.size = htoll(mtime);
+    msg.data.size = mtime;
     if (!WriteFdExactly(sc.fd, &msg.data, sizeof(msg.data))) goto fail;
 
     if (!ReadFdExactly(sc.fd, &msg.status, sizeof(msg.status))) goto fail;
 
     if (msg.status.id != ID_OKAY) {
         if (msg.status.id == ID_FAIL) {
-            size_t len = ltohl(msg.status.msglen);
+            size_t len = msg.status.msglen;
             if (len > 256) len = 256;
             if (!ReadFdExactly(sc.fd, sbuf->data, len)) goto fail;
             sbuf->data[len] = 0;
@@ -333,7 +333,7 @@
         id = msg.data.id;
 
     handle_data:
-        len = ltohl(msg.data.size);
+        len = msg.data.size;
         if (id == ID_DONE) break;
         if (id != ID_DATA) goto remote_error;
         if (len > sc.max) {
@@ -368,7 +368,7 @@
     adb_unlink(lpath);
 
     if(id == ID_FAIL) {
-        len = ltohl(msg.data.size);
+        len = msg.data.size;
         if(len > 256) len = 256;
         if(!ReadFdExactly(sc.fd, buffer, len)) {
             return -1;