aboutsummaryrefslogtreecommitdiff
path: root/adb_listeners.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-20 08:09:20 -0700
committerElliott Hughes <enh@google.com>2015-04-20 08:09:20 -0700
commita585cbd5aa8210095c7ed5e098dd67ab20649424 (patch)
tree721a7b7260106e6d56002feef2c6f57a858e18a2 /adb_listeners.cpp
parentbebf693cba868feff20031443b534842c0b439c0 (diff)
downloadadb-a585cbd5aa8210095c7ed5e098dd67ab20649424.tar.gz
Always explain why bind(2) failed.
This has confused several people lately. Bug: http://b/20219978 Change-Id: I2537ceb83bff0b3166c230c728d4389a983db858
Diffstat (limited to 'adb_listeners.cpp')
-rw-r--r--adb_listeners.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/adb_listeners.cpp b/adb_listeners.cpp
index 84b9c649..a1a5ddb5 100644
--- a/adb_listeners.cpp
+++ b/adb_listeners.cpp
@@ -190,17 +190,17 @@ int format_listeners(char* buf, size_t buflen)
return result;
}
-int remove_listener(const char *local_name, atransport* transport)
+install_status_t remove_listener(const char *local_name, atransport* transport)
{
alistener *l;
for (l = listener_list.next; l != &listener_list; l = l->next) {
if (!strcmp(local_name, l->local_name)) {
listener_disconnect(l, l->transport);
- return 0;
+ return INSTALL_STATUS_OK;
}
}
- return -1;
+ return INSTALL_STATUS_LISTENER_NOT_FOUND;
}
void remove_all_listeners(void)
@@ -268,10 +268,10 @@ install_status_t install_listener(const char *local_name,
listener->fd = local_name_to_fd(local_name);
if (listener->fd < 0) {
+ printf("cannot bind '%s': %s\n", local_name, strerror(errno));
free(listener->local_name);
free(listener->connect_to);
free(listener);
- printf("cannot bind '%s'\n", local_name);
return INSTALL_STATUS_CANNOT_BIND;
}