commit 867c71e5114e76b4f64e9f38e1be060fd9ba3a26
author Yi Kong <yikong@google.com> Mon Sep 13 14:34:25 2021 +0800
committer Elliott Hughes <enh@google.com> Tue Sep 14 11:21:53 2021 -0700
tree b842f299f2921c05a3a6a46e5252716fed767d8a
parent 434c85d54aeabd469f46c56005dc6b8de498ce7f

Fix unused-but-set-variable warnings

Test: presubmit
Change-Id: I7f77e7d5edbd0c429b7bea7490d54a6579a792be

client/file_sync_client.cpp

diff --git a/client/file_sync_client.cpp b/client/file_sync_client.cpp
index 2e8b975..af1deba 100644
--- a/client/file_sync_client.cpp
+++ b/client/file_sync_client.cpp
@@ -1276,14 +1276,12 @@
         return false;
     }
 
-    bool empty_dir = true;
     dirent* de;
     while ((de = readdir(dir.get()))) {
         if (IsDotOrDotDot(de->d_name)) {
             continue;
         }
 
-        empty_dir = false;
         std::string stat_path = lpath + de->d_name;
 
         struct stat st;

client/usb_linux.cpp

diff --git a/client/usb_linux.cpp b/client/usb_linux.cpp
index 00f3297..f75232f 100644
--- a/client/usb_linux.cpp
+++ b/client/usb_linux.cpp
@@ -148,7 +148,6 @@
             struct usb_endpoint_descriptor *ep1, *ep2;
             unsigned zero_mask = 0;
             size_t max_packet_size = 0;
-            unsigned vid, pid;
 
             if (contains_non_digit(de->d_name)) continue;
 
@@ -180,11 +179,10 @@
                 continue;
             }
 
-            vid = device->idVendor;
-            pid = device->idProduct;
-            DBGX("[ %s is V:%04x P:%04x ]\n", dev_name.c_str(), vid, pid);
+            DBGX("[ %s is V:%04x P:%04x ]\n", dev_name.c_str(), device->idVendor,
+                 device->idProduct);
 
-                // should have config descriptor next
+            // should have config descriptor next
             config = (struct usb_config_descriptor *)bufptr;
             bufptr += USB_DT_CONFIG_SIZE;
             if (config->bLength != USB_DT_CONFIG_SIZE || config->bDescriptorType != USB_DT_CONFIG) {

transport.cpp

diff --git a/transport.cpp b/transport.cpp
index cfae25d..3493cc1 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -208,7 +208,6 @@
 
             // Scan the whole list for kicked transports, so that we immediately handle an explicit
             // disconnect request.
-            bool kicked = false;
             for (auto it = reconnect_queue_.begin(); it != reconnect_queue_.end();) {
                 if (it->transport->kicked()) {
                     D("transport %s was kicked. giving up on it.", it->transport->serial.c_str());
@@ -217,7 +216,6 @@
                 } else {
                     ++it;
                 }
-                kicked = true;
             }
 
             if (reconnect_queue_.empty()) continue;