summaryrefslogtreecommitdiffstats
path: root/logd
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-08-11 10:36:39 -0700
committerMark Salyzyn <salyzyn@google.com>2014-09-01 10:42:04 -0700
commit19e8de0742e84355a63feb48b7e1fc6ffbcfbae1 (patch)
tree0f5844bd27171991f8ffad3c44a792d1a42726e6 /logd
parentc692410e1607a39cd6d55f4be8164fc630d9772c (diff)
downloadsystem_core-19e8de0742e84355a63feb48b7e1fc6ffbcfbae1.zip
system_core-19e8de0742e84355a63feb48b7e1fc6ffbcfbae1.tar.gz
system_core-19e8de0742e84355a63feb48b7e1fc6ffbcfbae1.tar.bz2
logd: simplification, return NULL instead of threadexit NULL
Bug: 16822776 Change-Id: I12133226f1b48d8fdc378dea0aadd78a4aae3da8
Diffstat (limited to 'logd')
-rw-r--r--logd/LogTimes.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/logd/LogTimes.cpp b/logd/LogTimes.cpp
index c6dc174..ea4e8c8 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;