commit e2a5846402b7284bed7946b1223e1b198eec33fd
author Josh Gao <jmgao@google.com> Mon Jul 18 19:50:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 18 19:50:46 2016 +0000
tree 854e8a393cb9b37c8b9d5eefbd972a212d93fd7b
parent 1f8c6c8c8e74d987dbc52a7c44fcf81dc244870c
parent d179556680d2208effa78a658992aacdde504d8e

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

Change-Id: I484051c028f89e292567485db49e2e20d26030be

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;
         }
     }