diff options
author | Elliott Hughes <enh@google.com> | 2015-05-07 01:10:10 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-07 01:10:10 +0200 |
commit | 45903c33cf4f638b2bf2d88b38d63119fb05f2c3 (patch) | |
tree | 3136b393812950303b9a67a4c9743cc9ec1683c6 | |
parent | am d5148f35: am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs" (diff) | |
parent | am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change." (diff) | |
download | android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar.gz android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar.bz2 android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar.lz android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar.xz android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.tar.zst android_bootable_recovery-45903c33cf4f638b2bf2d88b38d63119fb05f2c3.zip |
-rw-r--r-- | minadbd/services.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/minadbd/services.cpp b/minadbd/services.cpp index dd1fd7c4b..859463caf 100644 --- a/minadbd/services.cpp +++ b/minadbd/services.cpp @@ -61,8 +61,7 @@ static void sideload_host_service(int sfd, void* data) { 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]; if(adb_socketpair(s)) { 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->fd = s[1]; - adb_thread_t t; - if (adb_thread_create( &t, service_bootstrap_func, sti)){ + if (!adb_thread_create(service_bootstrap_func, sti)) { free(sti); adb_close(s[0]); adb_close(s[1]); |