diff options
author | Elliott Hughes <enh@google.com> | 2015-05-05 23:49:39 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-05 23:49:39 +0200 |
commit | 481508426cb258ebf809a9f46ec4f5689d0459ef (patch) | |
tree | 088f207b7dd6eea86696867baa482e173fa077cb | |
parent | am c7f64fdf: Merge "Keep multiple kernel logs" (diff) | |
parent | Merge "Track adb_thread_create API change." (diff) | |
download | android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar.gz android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar.bz2 android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar.lz android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar.xz android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.tar.zst android_bootable_recovery-481508426cb258ebf809a9f46ec4f5689d0459ef.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]); |