commit 78ec67bf3b70d4b0e231570a1b4027961e0977d8
author Josh Gao <jmgao@google.com> Wed Aug 07 16:32:08 2019 -0700
committer Josh Gao <jmgao@google.com> Mon Aug 12 13:46:34 2019 -0700
tree 18a41a98bd3fa98885c16fe4a1d0cd9550f0c301
parent 5c8ec7a9a10af659acb4f73bed0f28df5c448546

adb: rename syncmsg::*::time to mtime.

Test: mma
Change-Id: Ia7d743d523f7fb45d8be7518b2db763614edcc85

adb/client/file_sync_client.cpp

diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp
index 5d10238..1783d55 100644
--- a/adb/client/file_sync_client.cpp
+++ b/adb/client/file_sync_client.cpp
@@ -357,7 +357,7 @@
                             << msg.stat_v1.id;
             }
 
-            if (msg.stat_v1.mode == 0 && msg.stat_v1.size == 0 && msg.stat_v1.time == 0) {
+            if (msg.stat_v1.mode == 0 && msg.stat_v1.size == 0 && msg.stat_v1.mtime == 0) {
                 // There's no way for us to know what the error was.
                 errno = ENOPROTOOPT;
                 return false;
@@ -365,8 +365,8 @@
 
             st->st_mode = msg.stat_v1.mode;
             st->st_size = msg.stat_v1.size;
-            st->st_ctime = msg.stat_v1.time;
-            st->st_mtime = msg.stat_v1.time;
+            st->st_ctime = msg.stat_v1.mtime;
+            st->st_mtime = msg.stat_v1.mtime;
         }
 
         return true;
@@ -629,7 +629,7 @@
         if (!ReadFdExactly(sc.fd, buf, len)) return false;
         buf[len] = 0;
 
-        func(msg.dent.mode, msg.dent.size, msg.dent.time, buf);
+        func(msg.dent.mode, msg.dent.size, msg.dent.mtime, buf);
     }
 }
 

adb/daemon/file_sync_service.cpp

diff --git a/adb/daemon/file_sync_service.cpp b/adb/daemon/file_sync_service.cpp
index 0e70d47..c6e1563 100644
--- a/adb/daemon/file_sync_service.cpp
+++ b/adb/daemon/file_sync_service.cpp
@@ -139,7 +139,7 @@
     lstat(path, &st);
     msg.stat_v1.mode = st.st_mode;
     msg.stat_v1.size = st.st_size;
-    msg.stat_v1.time = st.st_mtime;
+    msg.stat_v1.mtime = st.st_mtime;
     return WriteFdExactly(s, &msg.stat_v1, sizeof(msg.stat_v1));
 }
 
@@ -191,7 +191,7 @@
             size_t d_name_length = strlen(de->d_name);
             msg.dent.mode = st.st_mode;
             msg.dent.size = st.st_size;
-            msg.dent.time = st.st_mtime;
+            msg.dent.mtime = st.st_mtime;
             msg.dent.namelen = d_name_length;
 
             if (!WriteFdExactly(s, &msg.dent, sizeof(msg.dent)) ||
@@ -205,7 +205,7 @@
     msg.dent.id = ID_DONE;
     msg.dent.mode = 0;
     msg.dent.size = 0;
-    msg.dent.time = 0;
+    msg.dent.mtime = 0;
     msg.dent.namelen = 0;
     return WriteFdExactly(s, &msg.dent, sizeof(msg.dent));
 }

adb/file_sync_protocol.h

diff --git a/adb/file_sync_protocol.h b/adb/file_sync_protocol.h
index 108639a..cd18a40 100644
--- a/adb/file_sync_protocol.h
+++ b/adb/file_sync_protocol.h
@@ -42,7 +42,7 @@
         uint32_t id;
         uint32_t mode;
         uint32_t size;
-        uint32_t time;
+        uint32_t mtime;
     } stat_v1;
     struct __attribute__((packed)) {
         uint32_t id;
@@ -62,7 +62,7 @@
         uint32_t id;
         uint32_t mode;
         uint32_t size;
-        uint32_t time;
+        uint32_t mtime;
         uint32_t namelen;
     } dent;
     struct __attribute__((packed)) {