• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

system/corennnnn


Commit MetaInfo

Révisiond179556680d2208effa78a658992aacdde504d8e (tree)
l'heure2016-07-19 04:47:45
AuteurJosh Gao <jmgao@goog...>
Commiterandroid-build-merger

Message de Log

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

Change-Id: Id77dd7ff1931f03ea7f1e0339eca6610e02e9122

Change Summary

Modification

--- a/adb/sockets.cpp
+++ b/adb/sockets.cpp
@@ -43,8 +43,6 @@
4343 using std::recursive_mutex;
4444 #endif
4545
46-static void local_socket_close(asocket* s);
47-
4846 static recursive_mutex& local_socket_list_lock = *new recursive_mutex();
4947 static unsigned local_socket_next_id = 1;
5048
@@ -128,7 +126,7 @@ void close_all_sockets(atransport *t)
128126 restart:
129127 for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {
130128 if (s->transport == t || (s->peer && s->peer->transport == t)) {
131- local_socket_close(s);
129+ s->close(s);
132130 goto restart;
133131 }
134132 }