From fc7c3b682b4c9cf77e45ec2db8610d7d963705c6 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Tue, 3 Nov 2015 14:44:04 -0800
Subject: [PATCH] adb: rename 'flag' to something less meaningless.

Change-Id: I7f7644a0a6f9a7d48508ddaad2e6a51266ae8ee6
---
 adb/file_sync_client.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp
index 56859b509..6087c06f2 100644
--- a/adb/file_sync_client.cpp
+++ b/adb/file_sync_client.cpp
@@ -467,7 +467,7 @@ struct copyinfo
     unsigned int time;
     unsigned int mode;
     uint64_t size;
-    int flag;
+    bool skip;
 };
 
 static copyinfo mkcopyinfo(const char* spath, const char* dpath, const char* name, bool isdir) {
@@ -477,7 +477,7 @@ static copyinfo mkcopyinfo(const char* spath, const char* dpath, const char* nam
     result.time = 0;
     result.mode = 0;
     result.size = 0;
-    result.flag = 0;
+    result.skip = false;
     return result;
 }
 
@@ -572,14 +572,14 @@ static bool copy_local_dir_remote(SyncConnection& sc, const char* lpath, const c
                 /* for links, we cannot update the atime/mtime */
                 if ((S_ISREG(ci.mode & mode) && timestamp == ci.time) ||
                         (S_ISLNK(ci.mode & mode) && timestamp >= ci.time)) {
-                    ci.flag = 1;
+                    ci.skip = true;
                 }
             }
         }
     }
 
     for (const copyinfo& ci : filelist) {
-        if (ci.flag == 0) {
+        if (!ci.skip) {
             if (list_only) {
                 fprintf(stderr, "would push: %s -> %s\n", ci.src.c_str(),
                         ci.dst.c_str());
@@ -726,7 +726,7 @@ static bool copy_remote_dir_local(SyncConnection& sc, const char* rpath, const c
     int pulled = 0;
     int skipped = 0;
     for (const copyinfo &ci : filelist) {
-        if (ci.flag == 0) {
+        if (!ci.skip) {
             sc.Printf("pull: %s -> %s", ci.src.c_str(), ci.dst.c_str());
             if (!sync_recv(sc, ci.src.c_str(), ci.dst.c_str())) {
                 return false;