ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 555d9198: Merge "Revert "logd: regression in log_strtok_r""

Browse source 
* commit '555d91985d174217c3e805997bcd86d9c94f5a6b':
  Revert "logd: regression in log_strtok_r"
This commit is contained in:
Mark Salyzyn 2015-06-12 22:43:09 +00:00 • committed by Android Git Automerger
commit 643f3c2fbf
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