commit 3bd73c12c07dcefc965abeef535ac53c4754d682
author Elliott Hughes <enh@google.com> Tue May 05 13:10:43 2015 -0700
committer Elliott Hughes <enh@google.com> Tue May 05 13:10:43 2015 -0700
tree 2cc65f5d6e779092e84892dfa4aabab03b96f262
parent 9337d0ac86d2baa33c2c64b0f50f84982d914e43

Give enum types CamelCase names for clarity.

Change-Id: I1c89f1cc155ee839f372fb14d972a288183b8bcd

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index 5c50c0a..e168b86 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -740,7 +740,7 @@
     return !*to_test;
 }
 
-atransport* acquire_one_transport(int state, transport_type ttype,
+atransport* acquire_one_transport(int state, TransportType type,
                                   const char* serial, std::string* error_out)
 {
     atransport *t;
@@ -773,7 +773,7 @@
                 result = t;
             }
         } else {
-            if (ttype == kTransportUsb && t->type == kTransportUsb) {
+            if (type == kTransportUsb && t->type == kTransportUsb) {
                 if (result) {
                     if (error_out) *error_out = "more than one device";
                     ambiguous = 1;
@@ -781,7 +781,7 @@
                     break;
                 }
                 result = t;
-            } else if (ttype == kTransportLocal && t->type == kTransportLocal) {
+            } else if (type == kTransportLocal && t->type == kTransportLocal) {
                 if (result) {
                     if (error_out) *error_out = "more than one emulator";
                     ambiguous = 1;
@@ -789,7 +789,7 @@
                     break;
                 }
                 result = t;
-            } else if (ttype == kTransportAny) {
+            } else if (type == kTransportAny) {
                 if (result) {
                     if (error_out) *error_out = "more than one device/emulator";
                     ambiguous = 1;