commit 201b65675bad8adf7f795677ea09f30fa8c7500c
author Josh Gao <jmgao@google.com> Mon Jul 18 19:47:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 18 19:47:45 2016 +0000
tree 3814541d384a029fef2161323eb73943846f0896
parent 9d9edbda2cf460f29056d6d41059dddf105ab6de
parent aad719ac4e385931eeef3774f3340a432d94edab

adb: use asocket\'s close function when closing.
am: f71c01493a

Change-Id: Id77dd7ff1931f03ea7f1e0339eca6610e02e9122

adb/sockets.cpp

diff --git a/adb/sockets.cpp b/adb/sockets.cpp
index 31b5443..3919147 100644
--- a/adb/sockets.cpp
+++ b/adb/sockets.cpp
@@ -43,8 +43,6 @@
 using std::recursive_mutex;
 #endif
 
-static void local_socket_close(asocket* s);
-
 static recursive_mutex& local_socket_list_lock = *new recursive_mutex();
 static unsigned local_socket_next_id = 1;
 
@@ -128,7 +126,7 @@
 restart:
     for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {
         if (s->transport == t || (s->peer && s->peer->transport == t)) {
-            local_socket_close(s);
+            s->close(s);
             goto restart;
         }
     }