ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb: remove unnecessary addr arguments to accept.

Browse source 
Follow up to https://android-review.googlesource.com/#/c/261412/

Change-Id: I0ee130db302940f3224cc823a26b02fc45da0fca
Test: mma
This commit is contained in:
Josh Gao 2016-08-23 15:41:56 -07:00
parent 5990191c4e
commit 78e1eb1949
4 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/adb_auth_client.cpp
View file

@ -151,9 +151,7 @@ void adb_auth_confirm_key(unsigned char* key, size_t len, atransport* t) {
}
static void adb_auth_listener(int fd, unsigned events, void* data) {
sockaddr_storage addr;
socklen_t alen = sizeof(addr);
int s = adb_socket_accept(fd, reinterpret_cast<sockaddr*>(&addr), &alen);
int s = adb_socket_accept(fd, nullptr, nullptr);
if (s < 0) {
PLOG(ERROR) << "Failed to accept";
return;

13
adb/adb_listeners.cpp
View file

@ -71,10 +71,7 @@ static ListenerList& listener_list = *new ListenerList();
static void ss_listener_event_func(int _fd, unsigned ev, void *_l) {
if (ev & FDE_READ) {
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen = sizeof(ss);
int fd = adb_socket_accept(_fd, addrp, &alen);
int fd = adb_socket_accept(_fd, nullptr, nullptr);
if (fd < 0) return;
int rcv_buf_size = CHUNK_SIZE;
@ -96,13 +93,7 @@ static void listener_event_func(int _fd, unsigned ev, void* _l)
asocket *s;
if (ev & FDE_READ) {
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen;
int fd;
alen = sizeof(ss);
fd = adb_socket_accept(_fd, addrp, &alen);
int fd = adb_socket_accept(_fd, nullptr, nullptr);
if (fd < 0) {
return;
}

5
adb/jdwp_service.cpp
View file

@ -444,10 +444,7 @@ static void jdwp_control_event(int s, unsigned events, void* _control) {
JdwpControl* control = (JdwpControl*)_control;
if (events & FDE_READ) {
sockaddr_storage ss;
sockaddr* addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t addrlen = sizeof(ss);
int s = adb_socket_accept(control->listen_socket, addrp, &addrlen);
int s = adb_socket_accept(control->listen_socket, nullptr, nullptr);
if (s < 0) {
if (errno == ECONNABORTED) {
/* oops, the JDWP process died really quick */

6
adb/transport_local.cpp
View file

@ -197,9 +197,6 @@ static void client_socket_thread(void* x) {
static void server_socket_thread(void* arg) {
int serverfd, fd;
sockaddr_storage ss;
sockaddr *addrp = reinterpret_cast<sockaddr*>(&ss);
socklen_t alen;
int port = (int) (uintptr_t) arg;
adb_thread_setname("server socket");
@ -217,9 +214,8 @@ static void server_socket_thread(void* arg) {
close_on_exec(serverfd);
}
alen = sizeof(ss);
D("server: trying to get new connection from %d", port);
fd = adb_socket_accept(serverfd, addrp, &alen);
fd = adb_socket_accept(serverfd, nullptr, nullptr);
if(fd >= 0) {
D("server: new connection on fd %d", fd);
close_on_exec(fd);