openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "logcat: fix error propagation." 

am: 2d1d8812cc

Change-Id: I0676572a6ff6e9591afb7f4e99cc64b92147dfef
This commit is contained in:
Mark Salyzyn 2017-08-09 00:59:33 +00:00 committed by android-build-merger
parent 3df3ec34e4 2d1d8812cc
commit 94984cf4bd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logcat/logcat.cpp
View File

@ -1019,7 +1019,6 @@ static int __logcat(android_logcat_context_internal* context) {
break;
case 'm': {
char* end = nullptr;
if (!getSizeTArg(optctx.optarg, &context->maxCount)) {
logcat_panic(context, HELP_FALSE,
"-%c \"%s\" isn't an "
@ -1182,7 +1181,6 @@ static int __logcat(android_logcat_context_internal* context) {
std::unique_ptr<char, void (*)(void*)> formats(
strdup(optctx.optarg), free);
char* arg = formats.get();
unsigned idMask = 0;
char* sv = nullptr; // protect against -ENOMEM above
while (!!(arg = strtok_r(arg, delimiters, &sv))) {
err = setLogFormat(context, arg);
@ -1733,7 +1731,7 @@ int android_logcat_run_command_thread(android_logcat_context ctx,
pthread_attr_setschedparam(&attr, &param);
pthread_attr_setschedpolicy(&attr, SCHED_BATCH);
if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)) {
int save_errno = errno;
save_errno = errno;
goto pthread_attr_exit;
}
@ -1773,7 +1771,7 @@ int android_logcat_run_command_thread(android_logcat_context ctx,
context->retval = EXIT_SUCCESS;
if (pthread_create(&context->thr, &attr,
(void*(*)(void*))__logcat, context)) {
int save_errno = errno;
save_errno = errno;
goto argv_exit;
}
pthread_attr_destroy(&attr);