From 19e8de0742e84355a63feb48b7e1fc6ffbcfbae1 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Mon, 11 Aug 2014 10:36:39 -0700
Subject: [PATCH] logd: simplification, return NULL instead of threadexit NULL

Bug: 16822776
Change-Id: I12133226f1b48d8fdc378dea0aadd78a4aae3da8
---
 logd/LogTimes.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/logd/LogTimes.cpp b/logd/LogTimes.cpp
index c6dc17461..ea4e8c83d 100644
--- a/logd/LogTimes.cpp
+++ b/logd/LogTimes.cpp
@@ -119,8 +119,7 @@ void *LogTimeEntry::threadStart(void *obj) {
     SocketClient *client = me->mClient;
     if (!client) {
         me->error();
-        pthread_exit(NULL);
-        // NOTREACH
+        return NULL;
     }
 
     LogBuffer &logbuf = me->mReader.logbuf();
@@ -154,9 +153,6 @@ void *LogTimeEntry::threadStart(void *obj) {
 
     unlock();
 
-    pthread_exit(NULL);
-
-    // NOTREACH
     pthread_cleanup_pop(true);
 
     return NULL;