aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-01-27 12:40:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-27 12:40:26 -0800
commitfd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a (patch)
tree204b161f278429959d45668233cb85dc8754a4a3
parentf464129950eaea49b1234fdcfd04ec8723e3c672 (diff)
parentf353207298ed14d0e6943353dd9788421a7537b8 (diff)
downloadbootable_recovery-fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a.zip
bootable_recovery-fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a.tar.gz
bootable_recovery-fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a.tar.bz2
am f3532072: Merge "minadbd: remove dead code"
* commit 'f353207298ed14d0e6943353dd9788421a7537b8': minadbd: remove dead code
-rw-r--r--minadbd/adb.h4
-rw-r--r--minadbd/transport.c21
2 files changed, 0 insertions, 25 deletions
diff --git a/minadbd/adb.h b/minadbd/adb.h
index 98fa597..688a6f2 100644
--- a/minadbd/adb.h
+++ b/minadbd/adb.h
@@ -244,15 +244,11 @@ void kick_transport( atransport* t );
#if ADB_HOST
int get_available_local_transport_index();
#endif
-int init_socket_transport(atransport *t, int s, int port, int local);
void init_usb_transport(atransport *t, usb_handle *usb, int state);
/* for MacOS X cleanup */
void close_usb_devices();
-/* cause new transports to be init'd and added to the list */
-void register_socket_transport(int s, const char *serial, int port, int local);
-
/* these should only be used for the "adb disconnect" command */
void unregister_transport(atransport *t);
void unregister_all_tcp_transports();
diff --git a/minadbd/transport.c b/minadbd/transport.c
index ff20049..4c0c97f 100644
--- a/minadbd/transport.c
+++ b/minadbd/transport.c
@@ -678,27 +678,6 @@ retry:
return result;
}
-void register_socket_transport(int s, const char *serial, int port, int local)
-{
- atransport *t = calloc(1, sizeof(atransport));
- char buff[32];
-
- if (!serial) {
- snprintf(buff, sizeof buff, "T-%p", t);
- serial = buff;
- }
- D("transport: %s init'ing for socket %d, on port %d\n", serial, s, port);
- if ( init_socket_transport(t, s, port, local) < 0 ) {
- adb_close(s);
- free(t);
- return;
- }
- if(serial) {
- t->serial = strdup(serial);
- }
- register_transport(t);
-}
-
void register_usb_transport(usb_handle *usb, const char *serial, unsigned writeable)
{
atransport *t = calloc(1, sizeof(atransport));