commit 82d6e1bba98f30e2a82d0a9b1c66f516e8125e5a
author Josh Gao <jmgao@google.com> Thu May 19 00:16:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 19 00:16:11 2016 +0000
tree 56e3d25f759dfd2eed32c5730f25c19237d58f1e
parent 40f8411a11de6b9002cc6f1bcb60ea55aa563766
parent 3ab050f8e7367c4bd351ccc549f804eb4803fb08

Merge "adb: use asocket\'s close function when closing." am: 684d543922
am: 43c058e51a

* commit '43c058e51a652874cfdf0c687ba1dee18f13f993':
  adb: use asocket's close function when closing.

Change-Id: I0681ff8c31c2f221e246a86857fbff779d2b7dcf

adb/sockets.cpp

diff --git a/adb/sockets.cpp b/adb/sockets.cpp
index b6ed868..b2555d0 100644
--- a/adb/sockets.cpp
+++ b/adb/sockets.cpp
@@ -39,8 +39,6 @@
 #include "sysdeps/mutex.h"
 #include "transport.h"
 
-static void local_socket_close(asocket* s);
-
 static std::recursive_mutex& local_socket_list_lock = *new std::recursive_mutex();
 static unsigned local_socket_next_id = 1;
 
@@ -118,7 +116,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;
         }
     }