Merge "Track adb_thread_create API change."

This commit is contained in:
Elliott Hughes
2015-05-05 21:40:47 +00:00
committed by Gerrit Code Review
+2 -4
View File
@@ -61,8 +61,7 @@ static void sideload_host_service(int sfd, void* data) {
exit(result == 0 ? 0 : 1); exit(result == 0 ? 0 : 1);
} }
static int create_service_thread(void (*func)(int, void *), void *cookie) static int create_service_thread(void (*func)(int, void *), void *cookie) {
{
int s[2]; int s[2];
if(adb_socketpair(s)) { if(adb_socketpair(s)) {
printf("cannot create service socket pair\n"); printf("cannot create service socket pair\n");
@@ -75,8 +74,7 @@ static int create_service_thread(void (*func)(int, void *), void *cookie)
sti->cookie = cookie; sti->cookie = cookie;
sti->fd = s[1]; sti->fd = s[1];
adb_thread_t t; if (!adb_thread_create(service_bootstrap_func, sti)) {
if (adb_thread_create( &t, service_bootstrap_func, sti)){
free(sti); free(sti);
adb_close(s[0]); adb_close(s[0]);
adb_close(s[1]); adb_close(s[1]);