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 "Revert "logd: regression in log_strtok_r""

This commit is contained in:
Mark Salyzyn 2015-06-12 22:37:21 +00:00 committed by Gerrit Code Review
parent de42d34cd5 4fb24dda34
commit 555d91985d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logd/LogKlog.cpp
View File

@ -68,9 +68,6 @@ static char *is_timestamp(char *s) {
continue;
}
if (!isdigit(c) && (c == ']')) {
if (first_period || (*s != ' ')) {
break;
}
return s;
}
}
@ -78,7 +75,7 @@ static char *is_timestamp(char *s) {
}
// Like strtok_r with "\r\n" except that we look for log signatures (regex)
// \(\(<[0-9]+>\)\([[] *[0-9]+[.][0-9]+[]] \)\{0,1\}\|[[] *[0-9]+[.][0-9]+[]] \)
// \(\(<[0-9]+>\)\([[] *[0-9]+[]]\)\{0,1\}\|[[] *[0-9]+[]]\)
// and split if we see a second one without a newline.
#define SIGNATURE_MASK 0xF0